v0.5.59: a2a support, documentation

v0.5.58: export folders, new tools, permissions groups enhancements
v0.5.57: subagents, context menu improvements, bug fixes
2026-01-14 01:18:15 -05:00 · 2026-01-13 13:21:21 -08:00 · 2026-01-13 00:56:59 -08:00 · 2026-01-11 11:38:40 -08:00 · 2026-01-10 00:31:34 -08:00 · 2026-01-08 23:36:56 -08:00
83 changed files with 1823 additions and 2999 deletions
--- a/.claude/commands/add-trigger.md
+++ b/.claude/commands/add-trigger.md
@@ -552,53 +552,6 @@ 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 & Webhook Input Formatting
-
-### Important: Two Sources of Truth
-
-There are two related but separate concerns:
-
-1. **Trigger `outputs`** - Schema/contract defining what fields SHOULD be available. Used by UI for tag dropdown.
-2. **`formatWebhookInput`** - Implementation that transforms raw webhook payload into actual data. Located in `apps/sim/lib/webhooks/utils.server.ts`.
-
-**These MUST be aligned.** The fields returned by `formatWebhookInput` should match what's defined in trigger `outputs`. If they differ:
- Tag dropdown shows fields that don't exist (broken variable resolution)
- Or actual data has fields not shown in dropdown (users can't discover them)
-
-### When to Add a formatWebhookInput Handler
-
- **Simple providers**: If the raw webhook payload structure already matches your outputs, you don't need a handler. The generic fallback returns `body` directly.
- **Complex providers**: If you need to transform, flatten, extract nested data, compute fields, or handle conditional logic, add a handler.
-
-### Adding a Handler
-
-In `apps/sim/lib/webhooks/utils.server.ts`, add a handler block:
-
-```typescript
-if (foundWebhook.provider === '{service}') {
-  // Transform raw webhook body to match trigger outputs
-  return {
-    eventType: body.type,
-    resourceId: body.data?.id || '',
-    timestamp: body.created_at,
-    resource: body.data,
-  }
-}
-```
-
-**Key rules:**
- Return fields that match your trigger `outputs` definition exactly
- No wrapper objects like `webhook: { data: ... }` or `{service}: { ... }`
- No duplication (don't spread body AND add individual fields)
- Use `null` for missing optional data, not empty objects with empty strings
-
-### Verify Alignment
-
-Run the alignment checker:
-```bash
-bunx scripts/check-trigger-alignment.ts {service}
-```
-
 ## Trigger Outputs

 Trigger outputs use the same schema as block outputs (NOT tool outputs).
@@ -696,11 +649,6 @@ export const {service}WebhookTrigger: TriggerConfig = {
 - [ ] Added `delete{Service}Webhook` function to `provider-subscriptions.ts`
 - [ ] Added provider to `cleanupExternalWebhook` function

-### Webhook Input Formatting
- [ ] Added handler in `apps/sim/lib/webhooks/utils.server.ts` (if custom formatting needed)
- [ ] Handler returns fields matching trigger `outputs` exactly
- [ ] Run `bunx scripts/check-trigger-alignment.ts {service}` to verify alignment
-
 ### Testing
 - [ ] Run `bun run type-check` to verify no TypeScript errors
 - [ ] Restart dev server to pick up new triggers
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -1855,25 +1855,17 @@ 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
+      {...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>
  )
 }
--- a/apps/docs/content/docs/en/tools/a2a.mdx
+++ b/apps/docs/content/docs/en/tools/a2a.mdx
@@ -208,3 +208,8 @@ Delete the push notification webhook configuration for a task.
 | `success` | boolean | Whether deletion was successful |


+
+## Notes
+
+- Category: `tools`
+- Type: `a2a`
--- a/apps/docs/content/docs/en/tools/lemlist.mdx
+++ b/apps/docs/content/docs/en/tools/lemlist.mdx
@@ -49,7 +49,8 @@ Retrieves lead information by email address or lead ID.
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `apiKey` | string | Yes | Lemlist API key |
-| `leadIdentifier` | string | Yes | Lead email address or lead ID |
+| `email` | string | No | Lead email address \(use either email or id\) |
+| `id` | string | No | Lead ID \(use either email or id\) |

 #### Output

--- a/apps/docs/content/docs/en/tools/slack.mdx
+++ b/apps/docs/content/docs/en/tools/slack.mdx
@@ -124,45 +124,6 @@ Read the latest messages from Slack channels. Retrieve conversation history with
 | --------- | ---- | ----------- |
 | `messages` | array | Array of message objects from the channel |

-### `slack_get_message`
-
-Retrieve a specific message by its timestamp. Useful for getting a thread parent message.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `authMethod` | string | No | Authentication method: oauth or bot_token |
-| `botToken` | string | No | Bot token for Custom Bot |
-| `channel` | string | Yes | Slack channel ID \(e.g., C1234567890\) |
-| `timestamp` | string | Yes | Message timestamp to retrieve \(e.g., 1405894322.002768\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `message` | object | The retrieved message object |
-
-### `slack_get_thread`
-
-Retrieve an entire thread including the parent message and all replies. Useful for getting full conversation context.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `authMethod` | string | No | Authentication method: oauth or bot_token |
-| `botToken` | string | No | Bot token for Custom Bot |
-| `channel` | string | Yes | Slack channel ID \(e.g., C1234567890\) |
-| `threadTs` | string | Yes | Thread timestamp \(thread_ts\) to retrieve \(e.g., 1405894322.002768\) |
-| `limit` | number | No | Maximum number of messages to return \(default: 100, max: 200\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `parentMessage` | object | The thread parent message |
-
 ### `slack_list_channels`

 List all channels in a Slack workspace. Returns public and private channels the bot has access to.
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -97,7 +97,6 @@ const ChatMessageSchema = z.object({
      })
    )
    .optional(),
-  commands: z.array(z.string()).optional(),
 })

 /**
@@ -133,7 +132,6 @@ export async function POST(req: NextRequest) {
      provider,
      conversationId,
      contexts,
-      commands,
    } = ChatMessageSchema.parse(body)
    // Ensure we have a consistent user message ID for this request
    const userMessageIdToUse = userMessageId || crypto.randomUUID()
@@ -464,7 +462,6 @@ export async function POST(req: NextRequest) {
      ...(integrationTools.length > 0 && { tools: integrationTools }),
      ...(baseTools.length > 0 && { baseTools }),
      ...(credentials && { credentials }),
-      ...(commands && commands.length > 0 && { commands }),
    }

    try {
--- a/apps/sim/app/api/workspaces/invitations/[invitationId]/route.test.ts
+++ b/apps/sim/app/api/workspaces/invitations/[invitationId]/route.test.ts
@@ -2,6 +2,13 @@ import { createSession, createWorkspaceRecord, loggerMock } from '@sim/testing'
 import { NextRequest } from 'next/server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'

+/**
+ * Tests for workspace invitation by ID API route
+ * Tests GET (details + token acceptance), DELETE (cancellation)
+ *
+ * @vitest-environment node
+ */
+
 const mockGetSession = vi.fn()
 const mockHasWorkspaceAdminAccess = vi.fn()

@@ -220,7 +227,7 @@ describe('Workspace Invitation [invitationId] API Route', () => {
      expect(response.headers.get('location')).toBe('https://test.sim.ai/workspace/workspace-456/w')
    })

-    it('should redirect to error page with token preserved when invitation expired', async () => {
+    it('should redirect to error page when invitation expired', async () => {
      const session = createSession({
        userId: mockUser.id,
        email: 'invited@example.com',
@@ -243,13 +250,12 @@ describe('Workspace Invitation [invitationId] API Route', () => {
      const response = await GET(request, { params })

      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toBe(
-        'https://test.sim.ai/invite/invitation-789?error=expired&token=token-abc123'
+      expect(response.headers.get('location')).toBe(
+        'https://test.sim.ai/invite/invitation-789?error=expired'
      )
    })

-    it('should redirect to error page with token preserved when email mismatch', async () => {
+    it('should redirect to error page when email mismatch', async () => {
      const session = createSession({
        userId: mockUser.id,
        email: 'wrong@example.com',
@@ -271,13 +277,12 @@ describe('Workspace Invitation [invitationId] API Route', () => {
      const response = await GET(request, { params })

      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toBe(
-        'https://test.sim.ai/invite/invitation-789?error=email-mismatch&token=token-abc123'
+      expect(response.headers.get('location')).toBe(
+        'https://test.sim.ai/invite/invitation-789?error=email-mismatch'
      )
    })

-    it('should return 404 when invitation not found (without token)', async () => {
+    it('should return 404 when invitation not found', async () => {
      const session = createSession({ userId: mockUser.id, email: mockUser.email })
      mockGetSession.mockResolvedValue(session)
      dbSelectResults = [[]]
@@ -291,189 +296,6 @@ describe('Workspace Invitation [invitationId] API Route', () => {
      expect(response.status).toBe(404)
      expect(data).toEqual({ error: 'Invitation not found or has expired' })
    })
-
-    it('should redirect to error page with token preserved when invitation not found (with token)', async () => {
-      const session = createSession({ userId: mockUser.id, email: mockUser.email })
-      mockGetSession.mockResolvedValue(session)
-      dbSelectResults = [[]]
-
-      const request = new NextRequest(
-        'http://localhost/api/workspaces/invitations/non-existent?token=some-invalid-token'
-      )
-      const params = Promise.resolve({ invitationId: 'non-existent' })
-
-      const response = await GET(request, { params })
-
-      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toBe(
-        'https://test.sim.ai/invite/non-existent?error=invalid-token&token=some-invalid-token'
-      )
-    })
-
-    it('should redirect to error page with token preserved when invitation already processed', async () => {
-      const session = createSession({
-        userId: mockUser.id,
-        email: 'invited@example.com',
-        name: mockUser.name,
-      })
-      mockGetSession.mockResolvedValue(session)
-
-      const acceptedInvitation = {
-        ...mockInvitation,
-        status: 'accepted',
-      }
-
-      dbSelectResults = [[acceptedInvitation], [mockWorkspace]]
-
-      const request = new NextRequest(
-        'http://localhost/api/workspaces/invitations/token-abc123?token=token-abc123'
-      )
-      const params = Promise.resolve({ invitationId: 'token-abc123' })
-
-      const response = await GET(request, { params })
-
-      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toBe(
-        'https://test.sim.ai/invite/invitation-789?error=already-processed&token=token-abc123'
-      )
-    })
-
-    it('should redirect to error page with token preserved when workspace not found', async () => {
-      const session = createSession({
-        userId: mockUser.id,
-        email: 'invited@example.com',
-        name: mockUser.name,
-      })
-      mockGetSession.mockResolvedValue(session)
-
-      dbSelectResults = [[mockInvitation], []]
-
-      const request = new NextRequest(
-        'http://localhost/api/workspaces/invitations/token-abc123?token=token-abc123'
-      )
-      const params = Promise.resolve({ invitationId: 'token-abc123' })
-
-      const response = await GET(request, { params })
-
-      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toBe(
-        'https://test.sim.ai/invite/invitation-789?error=workspace-not-found&token=token-abc123'
-      )
-    })
-
-    it('should redirect to error page with token preserved when user not found', async () => {
-      const session = createSession({
-        userId: mockUser.id,
-        email: 'invited@example.com',
-        name: mockUser.name,
-      })
-      mockGetSession.mockResolvedValue(session)
-
-      dbSelectResults = [[mockInvitation], [mockWorkspace], []]
-
-      const request = new NextRequest(
-        'http://localhost/api/workspaces/invitations/token-abc123?token=token-abc123'
-      )
-      const params = Promise.resolve({ invitationId: 'token-abc123' })
-
-      const response = await GET(request, { params })
-
-      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toBe(
-        'https://test.sim.ai/invite/invitation-789?error=user-not-found&token=token-abc123'
-      )
-    })
-
-    it('should URL encode special characters in token when preserving in error redirects', async () => {
-      const session = createSession({
-        userId: mockUser.id,
-        email: 'wrong@example.com',
-        name: mockUser.name,
-      })
-      mockGetSession.mockResolvedValue(session)
-
-      dbSelectResults = [
-        [mockInvitation],
-        [mockWorkspace],
-        [{ ...mockUser, email: 'wrong@example.com' }],
-      ]
-
-      const specialToken = 'token+with/special=chars&more'
-      const request = new NextRequest(
-        `http://localhost/api/workspaces/invitations/token-abc123?token=${encodeURIComponent(specialToken)}`
-      )
-      const params = Promise.resolve({ invitationId: 'token-abc123' })
-
-      const response = await GET(request, { params })
-
-      expect(response.status).toBe(307)
-      const location = response.headers.get('location')
-      expect(location).toContain('error=email-mismatch')
-      expect(location).toContain(`token=${encodeURIComponent(specialToken)}`)
-    })
-  })
-
-  describe('Token Preservation - Full Flow Scenario', () => {
-    it('should preserve token through email mismatch so user can retry with correct account', async () => {
-      const wrongSession = createSession({
-        userId: 'wrong-user',
-        email: 'wrong@example.com',
-        name: 'Wrong User',
-      })
-      mockGetSession.mockResolvedValue(wrongSession)
-
-      dbSelectResults = [
-        [mockInvitation],
-        [mockWorkspace],
-        [{ id: 'wrong-user', email: 'wrong@example.com' }],
-      ]
-
-      const request1 = new NextRequest(
-        'http://localhost/api/workspaces/invitations/token-abc123?token=token-abc123'
-      )
-      const params1 = Promise.resolve({ invitationId: 'token-abc123' })
-
-      const response1 = await GET(request1, { params: params1 })
-
-      expect(response1.status).toBe(307)
-      const location1 = response1.headers.get('location')
-      expect(location1).toBe(
-        'https://test.sim.ai/invite/invitation-789?error=email-mismatch&token=token-abc123'
-      )
-
-      vi.clearAllMocks()
-      dbSelectCallIndex = 0
-
-      const correctSession = createSession({
-        userId: mockUser.id,
-        email: 'invited@example.com',
-        name: mockUser.name,
-      })
-      mockGetSession.mockResolvedValue(correctSession)
-
-      dbSelectResults = [
-        [mockInvitation],
-        [mockWorkspace],
-        [{ ...mockUser, email: 'invited@example.com' }],
-        [],
-      ]
-
-      const request2 = new NextRequest(
-        'http://localhost/api/workspaces/invitations/token-abc123?token=token-abc123'
-      )
-      const params2 = Promise.resolve({ invitationId: 'token-abc123' })
-
-      const response2 = await GET(request2, { params: params2 })
-
-      expect(response2.status).toBe(307)
-      expect(response2.headers.get('location')).toBe(
-        'https://test.sim.ai/workspace/workspace-456/w'
-      )
-    })
  })

  describe('DELETE /api/workspaces/invitations/[invitationId]', () => {
--- a/apps/sim/app/api/workspaces/invitations/[invitationId]/route.ts
+++ b/apps/sim/app/api/workspaces/invitations/[invitationId]/route.ts
@@ -31,6 +31,7 @@ export async function GET(
  const isAcceptFlow = !!token // If token is provided, this is an acceptance flow

  if (!session?.user?.id) {
+    // For token-based acceptance flows, redirect to login
    if (isAcceptFlow) {
      return NextResponse.redirect(new URL(`/invite/${invitationId}?token=${token}`, getBaseUrl()))
    }
@@ -50,9 +51,8 @@ export async function GET(

    if (!invitation) {
      if (isAcceptFlow) {
-        const tokenParam = token ? `&token=${encodeURIComponent(token)}` : ''
        return NextResponse.redirect(
-          new URL(`/invite/${invitationId}?error=invalid-token${tokenParam}`, getBaseUrl())
+          new URL(`/invite/${invitationId}?error=invalid-token`, getBaseUrl())
        )
      }
      return NextResponse.json({ error: 'Invitation not found or has expired' }, { status: 404 })
@@ -60,9 +60,8 @@ export async function GET(

    if (new Date() > new Date(invitation.expiresAt)) {
      if (isAcceptFlow) {
-        const tokenParam = token ? `&token=${encodeURIComponent(token)}` : ''
        return NextResponse.redirect(
-          new URL(`/invite/${invitation.id}?error=expired${tokenParam}`, getBaseUrl())
+          new URL(`/invite/${invitation.id}?error=expired`, getBaseUrl())
        )
      }
      return NextResponse.json({ error: 'Invitation has expired' }, { status: 400 })
@@ -76,20 +75,17 @@ export async function GET(

    if (!workspaceDetails) {
      if (isAcceptFlow) {
-        const tokenParam = token ? `&token=${encodeURIComponent(token)}` : ''
        return NextResponse.redirect(
-          new URL(`/invite/${invitation.id}?error=workspace-not-found${tokenParam}`, getBaseUrl())
+          new URL(`/invite/${invitation.id}?error=workspace-not-found`, getBaseUrl())
        )
      }
      return NextResponse.json({ error: 'Workspace not found' }, { status: 404 })
    }

    if (isAcceptFlow) {
-      const tokenParam = token ? `&token=${encodeURIComponent(token)}` : ''
-
      if (invitation.status !== ('pending' as WorkspaceInvitationStatus)) {
        return NextResponse.redirect(
-          new URL(`/invite/${invitation.id}?error=already-processed${tokenParam}`, getBaseUrl())
+          new URL(`/invite/${invitation.id}?error=already-processed`, getBaseUrl())
        )
      }

@@ -104,7 +100,7 @@ export async function GET(

      if (!userData) {
        return NextResponse.redirect(
-          new URL(`/invite/${invitation.id}?error=user-not-found${tokenParam}`, getBaseUrl())
+          new URL(`/invite/${invitation.id}?error=user-not-found`, getBaseUrl())
        )
      }

@@ -112,7 +108,7 @@ export async function GET(

      if (!isValidMatch) {
        return NextResponse.redirect(
-          new URL(`/invite/${invitation.id}?error=email-mismatch${tokenParam}`, getBaseUrl())
+          new URL(`/invite/${invitation.id}?error=email-mismatch`, getBaseUrl())
        )
      }

--- a/apps/sim/app/invite/[id]/invite.tsx
+++ b/apps/sim/app/invite/[id]/invite.tsx
@@ -178,25 +178,23 @@ export default function Invite() {

  useEffect(() => {
    const errorReason = searchParams.get('error')
-    const isNew = searchParams.get('new') === 'true'
-    setIsNewUser(isNew)
-
-    const tokenFromQuery = searchParams.get('token')
-    if (tokenFromQuery) {
-      setToken(tokenFromQuery)
-      sessionStorage.setItem('inviteToken', tokenFromQuery)
-    } else {
-      const storedToken = sessionStorage.getItem('inviteToken')
-      if (storedToken && storedToken !== inviteId) {
-        setToken(storedToken)
-      }
-    }

    if (errorReason) {
      setError(getInviteError(errorReason))
      setIsLoading(false)
      return
    }
+
+    const isNew = searchParams.get('new') === 'true'
+    setIsNewUser(isNew)
+
+    const tokenFromQuery = searchParams.get('token')
+    const effectiveToken = tokenFromQuery || inviteId
+
+    if (effectiveToken) {
+      setToken(effectiveToken)
+      sessionStorage.setItem('inviteToken', effectiveToken)
+    }
  }, [searchParams, inviteId])

  useEffect(() => {
@@ -205,6 +203,7 @@ export default function Invite() {
    async function fetchInvitationDetails() {
      setIsLoading(true)
      try {
+        // Fetch invitation details using the invitation ID from the URL path
        const workspaceInviteResponse = await fetch(`/api/workspaces/invitations/${inviteId}`, {
          method: 'GET',
        })
@@ -221,6 +220,7 @@ export default function Invite() {
          return
        }

+        // Handle workspace invitation errors with specific status codes
        if (!workspaceInviteResponse.ok && workspaceInviteResponse.status !== 404) {
          const errorCode = parseApiError(null, workspaceInviteResponse.status)
          const errorData = await workspaceInviteResponse.json().catch(() => ({}))
@@ -229,6 +229,7 @@ export default function Invite() {
            error: errorData,
          })

+          // Refine error code based on response body if available
          if (errorData.error) {
            const refinedCode = parseApiError(errorData.error, workspaceInviteResponse.status)
            setError(getInviteError(refinedCode))
@@ -253,11 +254,13 @@ export default function Invite() {
          if (data) {
            setInvitationType('organization')

+            // Check if user is already in an organization BEFORE showing the invitation
            const activeOrgResponse = await client.organization
              .getFullOrganization()
              .catch(() => ({ data: null }))

            if (activeOrgResponse?.data) {
+              // User is already in an organization
              setCurrentOrgName(activeOrgResponse.data.name)
              setError(getInviteError('already-in-organization'))
              setIsLoading(false)
@@ -286,6 +289,7 @@ export default function Invite() {
            throw { code: 'invalid-invitation' }
          }
        } catch (orgErr: any) {
+          // If this is our structured error, use it directly
          if (orgErr.code) {
            throw orgErr
          }
@@ -312,6 +316,7 @@ export default function Invite() {
      window.location.href = `/api/workspaces/invitations/${encodeURIComponent(inviteId)}?token=${encodeURIComponent(token || '')}`
    } else {
      try {
+        // Get the organizationId from invitation details
        const orgId = invitationDetails?.data?.organizationId

        if (!orgId) {
@@ -320,6 +325,7 @@ export default function Invite() {
          return
        }

+        // Use our custom API endpoint that handles Pro usage snapshot
        const response = await fetch(`/api/organizations/${orgId}/invitations/${inviteId}`, {
          method: 'PUT',
          headers: {
@@ -341,6 +347,7 @@ export default function Invite() {
          return
        }

+        // Set the organization as active
        await client.organization.setActive({
          organizationId: orgId,
        })
@@ -353,6 +360,7 @@ export default function Invite() {
      } catch (err: any) {
        logger.error('Error accepting invitation:', err)

+        // Reset accepted state on error
        setAccepted(false)

        const errorCode = parseApiError(err)
@@ -363,9 +371,7 @@ export default function Invite() {
  }

  const getCallbackUrl = () => {
-    const effectiveToken =
-      token || sessionStorage.getItem('inviteToken') || searchParams.get('token')
-    return `/invite/${inviteId}${effectiveToken && effectiveToken !== inviteId ? `?token=${effectiveToken}` : ''}`
+    return `/invite/${inviteId}${token && token !== inviteId ? `?token=${token}` : ''}`
  }

  if (!session?.user && !isPending) {
@@ -429,6 +435,7 @@ export default function Invite() {
  if (error) {
    const callbackUrl = encodeURIComponent(getCallbackUrl())

+    // Special handling for already in organization
    if (error.code === 'already-in-organization') {
      return (
        <InviteLayout>
@@ -456,6 +463,7 @@ export default function Invite() {
      )
    }

+    // Handle email mismatch - user needs to sign in with a different account
    if (error.code === 'email-mismatch') {
      return (
        <InviteLayout>
@@ -482,6 +490,7 @@ export default function Invite() {
      )
    }

+    // Handle auth-related errors - prompt user to sign in
    if (error.requiresAuth) {
      return (
        <InviteLayout>
@@ -509,6 +518,7 @@ export default function Invite() {
      )
    }

+    // Handle retryable errors
    const actions: Array<{
      label: string
      onClick: () => void
@@ -540,6 +550,7 @@ export default function Invite() {
    )
  }

+  // Show success only if accepted AND no error
  if (accepted && !error) {
    return (
      <InviteLayout>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
@@ -531,6 +531,35 @@ export function Chat() {
                  return
                }

+                if (
+                  selectedOutputs.length > 0 &&
+                  'logs' in result &&
+                  Array.isArray(result.logs) &&
+                  activeWorkflowId
+                ) {
+                  const additionalOutputs: string[] = []
+
+                  for (const outputId of selectedOutputs) {
+                    const blockId = extractBlockIdFromOutputId(outputId)
+                    const path = extractPathFromOutputId(outputId, blockId)
+
+                    if (path === 'content') continue
+
+                    const outputValue = extractOutputFromLogs(result.logs as BlockLog[], outputId)
+                    if (outputValue !== undefined) {
+                      const formattedValue =
+                        typeof outputValue === 'string' ? outputValue : JSON.stringify(outputValue)
+                      if (formattedValue) {
+                        additionalOutputs.push(`**${path}:** ${formattedValue}`)
+                      }
+                    }
+                  }
+
+                  if (additionalOutputs.length > 0) {
+                    appendMessageContent(responseMessageId, `\n\n${additionalOutputs.join('\n\n')}`)
+                  }
+                }
+
                finalizeMessageStream(responseMessageId)
              } else if (contentChunk) {
                accumulatedContent += contentChunk
--- 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
@@ -1,6 +1,6 @@
 'use client'

-import React, { memo, useCallback, useState } from 'react'
+import React, { useEffect, useMemo, useState } from 'react'
 import { Check, Copy } from 'lucide-react'
 import ReactMarkdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
@@ -28,95 +28,55 @@ const getTextContent = (element: React.ReactNode): string => {
  return ''
 }

-/**
- * Maps common language aliases to supported viewer languages
- */
-const LANGUAGE_MAP: Record<string, 'javascript' | 'json' | 'python'> = {
-  js: 'javascript',
-  javascript: 'javascript',
-  jsx: 'javascript',
-  ts: 'javascript',
-  typescript: 'javascript',
-  tsx: 'javascript',
-  json: 'json',
-  python: 'python',
-  py: 'python',
-  code: 'javascript',
+// Global layout fixes for markdown content inside the copilot panel
+if (typeof document !== 'undefined') {
+  const styleId = 'copilot-markdown-fix'
+  if (!document.getElementById(styleId)) {
+    const style = document.createElement('style')
+    style.id = styleId
+    style.textContent = `
+      /* Prevent any markdown content from expanding beyond the panel */
+      .copilot-markdown-wrapper,
+      .copilot-markdown-wrapper * {
+        max-width: 100% !important;
+      }
+
+      .copilot-markdown-wrapper p,
+      .copilot-markdown-wrapper li {
+        overflow-wrap: anywhere !important;
+        word-break: break-word !important;
+      }
+
+      .copilot-markdown-wrapper a {
+        overflow-wrap: anywhere !important;
+        word-break: break-all !important;
+      }
+
+      .copilot-markdown-wrapper code:not(pre code) {
+        white-space: normal !important;
+        overflow-wrap: anywhere !important;
+        word-break: break-word !important;
+      }
+
+      /* Reduce top margin for first heading (e.g., right after thinking block) */
+      .copilot-markdown-wrapper > h1:first-child,
+      .copilot-markdown-wrapper > h2:first-child,
+      .copilot-markdown-wrapper > h3:first-child,
+      .copilot-markdown-wrapper > h4:first-child {
+        margin-top: 0.25rem !important;
+      }
+    `
+    document.head.appendChild(style)
+  }
 }

-/**
- * Normalizes a language string to a supported viewer language
- */
-function normalizeLanguage(lang: string): 'javascript' | 'json' | 'python' {
-  const normalized = (lang || '').toLowerCase()
-  return LANGUAGE_MAP[normalized] || 'javascript'
-}
-
-/**
- * Props for the CodeBlock component
- */
-interface CodeBlockProps {
-  /** Code content to display */
-  code: string
-  /** Language identifier from markdown */
-  language: string
-}
-
-/**
- * CodeBlock component with isolated copy state
- * Prevents full markdown re-renders when copy button is clicked
- */
-const CodeBlock = memo(function CodeBlock({ code, language }: CodeBlockProps) {
-  const [copied, setCopied] = useState(false)
-
-  const handleCopy = useCallback(() => {
-    if (code) {
-      navigator.clipboard.writeText(code)
-      setCopied(true)
-      setTimeout(() => setCopied(false), 2000)
-    }
-  }, [code])
-
-  const viewerLanguage = normalizeLanguage(language)
-  const displayLanguage = language === 'code' ? viewerLanguage : language
-
-  return (
-    <div className='mt-2.5 mb-2.5 w-0 min-w-full overflow-hidden rounded-md border border-[var(--border-1)] bg-[var(--surface-1)] text-sm'>
-      <div className='flex items-center justify-between border-[var(--border-1)] border-b px-3 py-1'>
-        <span className='font-season text-[var(--text-muted)] text-xs'>{displayLanguage}</span>
-        <button
-          onClick={handleCopy}
-          className='text-[var(--text-muted)] transition-colors hover:text-[var(--text-tertiary)]'
-          title='Copy'
-          type='button'
-        >
-          {copied ? (
-            <Check className='h-3 w-3' strokeWidth={2} />
-          ) : (
-            <Copy className='h-3 w-3' strokeWidth={2} />
-          )}
-        </button>
-      </div>
-      <Code.Viewer
-        code={code.replace(/\n+$/, '')}
-        showGutter
-        language={viewerLanguage}
-        className='m-0 min-h-0 rounded-none border-0 bg-transparent'
-      />
-    </div>
-  )
-})
-
 /**
 * Link component with hover preview tooltip
+ * Displays full URL on hover for better UX
+ * @param props - Component props with href and children
+ * @returns Link element with tooltip preview
 */
-const LinkWithPreview = memo(function LinkWithPreview({
-  href,
-  children,
-}: {
-  href: string
-  children: React.ReactNode
-}) {
+function LinkWithPreview({ href, children }: { href: string; children: React.ReactNode }) {
  return (
    <Tooltip.Root delayDuration={300}>
      <Tooltip.Trigger asChild>
@@ -134,7 +94,7 @@ const LinkWithPreview = memo(function LinkWithPreview({
      </Tooltip.Content>
    </Tooltip.Root>
  )
-})
+}

 /**
 * Props for the CopilotMarkdownRenderer component
@@ -144,197 +104,275 @@ interface CopilotMarkdownRendererProps {
  content: string
 }

-/**
- * Static markdown component definitions - optimized for LLM chat spacing
- * Tighter spacing compared to traditional prose for better chat UX
- */
-const markdownComponents = {
-  // Paragraphs - tight spacing, no margin on last
-  p: ({ children }: React.HTMLAttributes<HTMLParagraphElement>) => (
-    <p className='mb-1.5 font-base font-season text-[var(--text-primary)] text-sm leading-[1.4] last:mb-0 dark:font-[470]'>
-      {children}
-    </p>
-  ),
-
-  // Headings - minimal margins for chat context
-  h1: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
-    <h1 className='mt-2 mb-1 font-season font-semibold text-[var(--text-primary)] text-base first:mt-0'>
-      {children}
-    </h1>
-  ),
-  h2: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
-    <h2 className='mt-2 mb-1 font-season font-semibold text-[15px] text-[var(--text-primary)] first:mt-0'>
-      {children}
-    </h2>
-  ),
-  h3: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
-    <h3 className='mt-1.5 mb-0.5 font-season font-semibold text-[var(--text-primary)] text-sm first:mt-0'>
-      {children}
-    </h3>
-  ),
-  h4: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
-    <h4 className='mt-1.5 mb-0.5 font-season font-semibold text-[var(--text-primary)] text-sm first:mt-0'>
-      {children}
-    </h4>
-  ),
-
-  // Lists - compact spacing
-  ul: ({ children }: React.HTMLAttributes<HTMLUListElement>) => (
-    <ul
-      className='my-1 space-y-0.5 pl-5 font-base font-season text-[var(--text-primary)] dark:font-[470]'
-      style={{ listStyleType: 'disc' }}
-    >
-      {children}
-    </ul>
-  ),
-  ol: ({ children }: React.HTMLAttributes<HTMLOListElement>) => (
-    <ol
-      className='my-1 space-y-0.5 pl-5 font-base font-season text-[var(--text-primary)] dark:font-[470]'
-      style={{ listStyleType: 'decimal' }}
-    >
-      {children}
-    </ol>
-  ),
-  li: ({ children }: React.LiHTMLAttributes<HTMLLIElement>) => (
-    <li
-      className='font-base font-season text-[var(--text-primary)] text-sm leading-[1.4] dark:font-[470]'
-      style={{ display: 'list-item' }}
-    >
-      {children}
-    </li>
-  ),
-
-  // Code blocks - handled by CodeBlock component
-  pre: ({ children }: React.HTMLAttributes<HTMLPreElement>) => {
-    let codeContent: React.ReactNode = children
-    let language = 'code'
-
-    if (
-      React.isValidElement<{ className?: string; children?: React.ReactNode }>(children) &&
-      children.type === 'code'
-    ) {
-      const childElement = children as React.ReactElement<{
-        className?: string
-        children?: React.ReactNode
-      }>
-      codeContent = childElement.props.children
-      language = childElement.props.className?.replace('language-', '') || 'code'
-    }
-
-    let actualCodeText = ''
-    if (typeof codeContent === 'string') {
-      actualCodeText = codeContent
-    } else if (React.isValidElement(codeContent)) {
-      actualCodeText = getTextContent(codeContent)
-    } else if (Array.isArray(codeContent)) {
-      actualCodeText = codeContent
-        .map((child) =>
-          typeof child === 'string'
-            ? child
-            : React.isValidElement(child)
-              ? getTextContent(child)
-              : ''
-        )
-        .join('')
-    } else {
-      actualCodeText = String(codeContent || '')
-    }
-
-    return <CodeBlock code={actualCodeText} language={language} />
-  },
-
-  // Inline code
-  code: ({
-    className,
-    children,
-    ...props
-  }: React.HTMLAttributes<HTMLElement> & { className?: string }) => (
-    <code
-      className='whitespace-normal break-all rounded border border-[var(--border-1)] bg-[var(--surface-1)] px-1 py-0.5 font-mono text-[0.85em] text-[var(--text-primary)]'
-      {...props}
-    >
-      {children}
-    </code>
-  ),
-
-  // Text formatting
-  strong: ({ children }: React.HTMLAttributes<HTMLElement>) => (
-    <strong className='font-semibold text-[var(--text-primary)]'>{children}</strong>
-  ),
-  b: ({ children }: React.HTMLAttributes<HTMLElement>) => (
-    <b className='font-semibold text-[var(--text-primary)]'>{children}</b>
-  ),
-  em: ({ children }: React.HTMLAttributes<HTMLElement>) => (
-    <em className='text-[var(--text-primary)] italic'>{children}</em>
-  ),
-  i: ({ children }: React.HTMLAttributes<HTMLElement>) => (
-    <i className='text-[var(--text-primary)] italic'>{children}</i>
-  ),
-
-  // Blockquote - compact
-  blockquote: ({ children }: React.HTMLAttributes<HTMLQuoteElement>) => (
-    <blockquote className='my-1.5 border-[var(--border-1)] border-l-2 py-0.5 pl-3 font-season text-[var(--text-secondary)] text-sm italic'>
-      {children}
-    </blockquote>
-  ),
-
-  // Horizontal rule
-  hr: () => <hr className='my-3 border-[var(--divider)] border-t' />,
-
-  // Links
-  a: ({ href, children }: React.AnchorHTMLAttributes<HTMLAnchorElement>) => (
-    <LinkWithPreview href={href || '#'}>{children}</LinkWithPreview>
-  ),
-
-  // Tables - compact
-  table: ({ children }: React.TableHTMLAttributes<HTMLTableElement>) => (
-    <div className='my-2 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>
-  ),
-  thead: ({ children }: React.HTMLAttributes<HTMLTableSectionElement>) => (
-    <thead className='bg-[var(--surface-5)] text-left dark:bg-[var(--surface-4)]'>{children}</thead>
-  ),
-  tbody: ({ children }: React.HTMLAttributes<HTMLTableSectionElement>) => (
-    <tbody className='divide-y divide-[var(--border-1)]'>{children}</tbody>
-  ),
-  tr: ({ children }: React.HTMLAttributes<HTMLTableRowElement>) => (
-    <tr className='border-[var(--border-1)] border-b'>{children}</tr>
-  ),
-  th: ({ children }: React.ThHTMLAttributes<HTMLTableCellElement>) => (
-    <th className='border-[var(--border-1)] border-r px-2 py-1 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-2 py-1 align-top font-base text-[var(--text-primary)] last:border-r-0 dark:font-[470]'>
-      {children}
-    </td>
-  ),
-
-  // Images
-  img: ({ src, alt, ...props }: React.ImgHTMLAttributes<HTMLImageElement>) => (
-    <img src={src} alt={alt || 'Image'} className='my-2 h-auto max-w-full rounded-md' {...props} />
-  ),
-}
-
 /**
 * CopilotMarkdownRenderer renders markdown content with custom styling
- * Optimized for LLM chat: tight spacing, memoized components, isolated state
+ * Supports GitHub-flavored markdown, code blocks with syntax highlighting,
+ * tables, links with preview, and more
 *
 * @param props - Component props
 * @returns Rendered markdown content
 */
-function CopilotMarkdownRenderer({ content }: CopilotMarkdownRendererProps) {
+export default function CopilotMarkdownRenderer({ content }: CopilotMarkdownRendererProps) {
+  const [copiedCodeBlocks, setCopiedCodeBlocks] = useState<Record<string, boolean>>({})
+
+  useEffect(() => {
+    const timers: Record<string, NodeJS.Timeout> = {}
+
+    Object.keys(copiedCodeBlocks).forEach((key) => {
+      if (copiedCodeBlocks[key]) {
+        timers[key] = setTimeout(() => {
+          setCopiedCodeBlocks((prev) => ({ ...prev, [key]: false }))
+        }, 2000)
+      }
+    })
+
+    return () => {
+      Object.values(timers).forEach(clearTimeout)
+    }
+  }, [copiedCodeBlocks])
+
+  const markdownComponents = useMemo(
+    () => ({
+      p: ({ children }: React.HTMLAttributes<HTMLParagraphElement>) => (
+        <p className='mb-2 font-base font-season text-[var(--text-primary)] text-sm leading-[1.25rem] last:mb-0 dark:font-[470]'>
+          {children}
+        </p>
+      ),
+
+      h1: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
+        <h1 className='mt-3 mb-3 font-season font-semibold text-2xl text-[var(--text-primary)]'>
+          {children}
+        </h1>
+      ),
+      h2: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
+        <h2 className='mt-2.5 mb-2.5 font-season font-semibold text-[var(--text-primary)] text-xl'>
+          {children}
+        </h2>
+      ),
+      h3: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
+        <h3 className='mt-2 mb-2 font-season font-semibold text-[var(--text-primary)] text-lg'>
+          {children}
+        </h3>
+      ),
+      h4: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
+        <h4 className='mt-2 mb-2 font-season font-semibold text-[var(--text-primary)] text-base'>
+          {children}
+        </h4>
+      ),
+
+      ul: ({ children }: React.HTMLAttributes<HTMLUListElement>) => (
+        <ul
+          className='mt-1 mb-1 space-y-1.5 pl-6 font-base font-season text-[var(--text-primary)] dark:font-[470]'
+          style={{ listStyleType: 'disc' }}
+        >
+          {children}
+        </ul>
+      ),
+      ol: ({ children }: React.HTMLAttributes<HTMLOListElement>) => (
+        <ol
+          className='mt-1 mb-1 space-y-1.5 pl-6 font-base font-season text-[var(--text-primary)] dark:font-[470]'
+          style={{ listStyleType: 'decimal' }}
+        >
+          {children}
+        </ol>
+      ),
+      li: ({
+        children,
+        ordered,
+      }: React.LiHTMLAttributes<HTMLLIElement> & { ordered?: boolean }) => (
+        <li
+          className='font-base font-season text-[var(--text-primary)] dark:font-[470]'
+          style={{ display: 'list-item' }}
+        >
+          {children}
+        </li>
+      ),
+
+      pre: ({ children }: React.HTMLAttributes<HTMLPreElement>) => {
+        let codeContent: React.ReactNode = children
+        let language = 'code'
+
+        if (
+          React.isValidElement<{ className?: string; children?: React.ReactNode }>(children) &&
+          children.type === 'code'
+        ) {
+          const childElement = children as React.ReactElement<{
+            className?: string
+            children?: React.ReactNode
+          }>
+          codeContent = childElement.props.children
+          language = childElement.props.className?.replace('language-', '') || 'code'
+        }
+
+        let actualCodeText = ''
+        if (typeof codeContent === 'string') {
+          actualCodeText = codeContent
+        } else if (React.isValidElement(codeContent)) {
+          actualCodeText = getTextContent(codeContent)
+        } else if (Array.isArray(codeContent)) {
+          actualCodeText = codeContent
+            .map((child) =>
+              typeof child === 'string'
+                ? child
+                : React.isValidElement(child)
+                  ? getTextContent(child)
+                  : ''
+            )
+            .join('')
+        } else {
+          actualCodeText = String(codeContent || '')
+        }
+
+        const codeText = actualCodeText || 'code'
+        const codeBlockKey = `${language}-${codeText.substring(0, 30).replace(/\s/g, '-')}-${codeText.length}`
+
+        const showCopySuccess = copiedCodeBlocks[codeBlockKey] || false
+
+        const handleCopy = () => {
+          const textToCopy = actualCodeText
+          if (textToCopy) {
+            navigator.clipboard.writeText(textToCopy)
+            setCopiedCodeBlocks((prev) => ({ ...prev, [codeBlockKey]: true }))
+          }
+        }
+
+        const normalizedLanguage = (language || '').toLowerCase()
+        const viewerLanguage: 'javascript' | 'json' | 'python' =
+          normalizedLanguage === 'json'
+            ? 'json'
+            : normalizedLanguage === 'python' || normalizedLanguage === 'py'
+              ? 'python'
+              : 'javascript'
+
+        return (
+          <div className='mt-6 mb-6 w-0 min-w-full overflow-hidden rounded-md border border-[var(--border-1)] bg-[var(--surface-1)] text-sm'>
+            <div className='flex items-center justify-between border-[var(--border-1)] border-b px-4 py-1.5'>
+              <span className='font-season text-[var(--text-muted)] text-xs'>
+                {language === 'code' ? viewerLanguage : language}
+              </span>
+              <button
+                onClick={handleCopy}
+                className='text-[var(--text-muted)] transition-colors hover:text-[var(--text-tertiary)]'
+                title='Copy'
+              >
+                {showCopySuccess ? (
+                  <Check className='h-3 w-3' strokeWidth={2} />
+                ) : (
+                  <Copy className='h-3 w-3' strokeWidth={2} />
+                )}
+              </button>
+            </div>
+            <Code.Viewer
+              code={actualCodeText.replace(/\n+$/, '')}
+              showGutter
+              language={viewerLanguage}
+              className='m-0 min-h-0 rounded-none border-0 bg-transparent'
+            />
+          </div>
+        )
+      },
+
+      code: ({
+        inline,
+        className,
+        children,
+        ...props
+      }: React.HTMLAttributes<HTMLElement> & { className?: string; inline?: boolean }) => {
+        if (inline) {
+          return (
+            <code
+              className='whitespace-normal break-all rounded border border-[var(--border-1)] bg-[var(--surface-1)] px-1 py-0.5 font-mono text-[0.9em] text-[var(--text-primary)]'
+              {...props}
+            >
+              {children}
+            </code>
+          )
+        }
+        return (
+          <code className={className} {...props}>
+            {children}
+          </code>
+        )
+      },
+
+      strong: ({ children }: React.HTMLAttributes<HTMLElement>) => (
+        <strong className='font-semibold text-[var(--text-primary)]'>{children}</strong>
+      ),
+
+      b: ({ children }: React.HTMLAttributes<HTMLElement>) => (
+        <b className='font-semibold text-[var(--text-primary)]'>{children}</b>
+      ),
+
+      em: ({ children }: React.HTMLAttributes<HTMLElement>) => (
+        <em className='text-[var(--text-primary)] italic'>{children}</em>
+      ),
+
+      i: ({ children }: React.HTMLAttributes<HTMLElement>) => (
+        <i className='text-[var(--text-primary)] italic'>{children}</i>
+      ),
+
+      blockquote: ({ children }: React.HTMLAttributes<HTMLQuoteElement>) => (
+        <blockquote className='my-4 border-[var(--border-1)] border-l-4 py-1 pl-4 font-season text-[var(--text-secondary)] italic'>
+          {children}
+        </blockquote>
+      ),
+
+      hr: () => <hr className='my-8 border-[var(--divider)] border-t' />,
+
+      a: ({ href, children, ...props }: React.AnchorHTMLAttributes<HTMLAnchorElement>) => (
+        <LinkWithPreview href={href || '#'} {...props}>
+          {children}
+        </LinkWithPreview>
+      ),
+
+      table: ({ children }: React.TableHTMLAttributes<HTMLTableElement>) => (
+        <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>
+      ),
+      thead: ({ children }: React.HTMLAttributes<HTMLTableSectionElement>) => (
+        <thead className='bg-[var(--surface-5)] text-left dark:bg-[var(--surface-4)]'>
+          {children}
+        </thead>
+      ),
+      tbody: ({ children }: React.HTMLAttributes<HTMLTableSectionElement>) => (
+        <tbody className='divide-y divide-[var(--border-1)]'>{children}</tbody>
+      ),
+      tr: ({ children }: React.HTMLAttributes<HTMLTableRowElement>) => (
+        <tr className='border-[var(--border-1)] border-b transition-colors hover:bg-[var(--surface-5)] dark:hover:bg-[var(--surface-4)]/60'>
+          {children}
+        </tr>
+      ),
+      th: ({ children }: React.ThHTMLAttributes<HTMLTableCellElement>) => (
+        <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-2.5 py-1.5 align-top font-base text-[var(--text-primary)] last:border-r-0 dark:font-[470]'>
+          {children}
+        </td>
+      ),
+
+      img: ({ src, alt, ...props }: React.ImgHTMLAttributes<HTMLImageElement>) => (
+        <img
+          src={src}
+          alt={alt || 'Image'}
+          className='my-3 h-auto max-w-full rounded-md'
+          {...props}
+        />
+      ),
+    }),
+    [copiedCodeBlocks]
+  )
+
  return (
-    <div className='max-w-full break-words font-base font-season text-[var(--text-primary)] text-sm leading-[1.4] dark:font-[470] [&_*]:max-w-full [&_a]:break-all [&_code:not(pre_code)]:break-words [&_li]:break-words [&_p]:break-words'>
+    <div className='copilot-markdown-wrapper max-w-full space-y-3 break-words font-base font-season text-[var(--text-primary)] text-sm leading-[1.25rem] dark:font-[470]'>
      <ReactMarkdown remarkPlugins={[remarkGfm]} components={markdownComponents}>
        {content}
      </ReactMarkdown>
    </div>
  )
 }
-
-export default memo(CopilotMarkdownRenderer)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming.tsx
@@ -2,38 +2,18 @@ import { memo, useEffect, useRef, useState } from 'react'
 import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'

 /**
- * Minimum delay between characters (fast catch-up mode)
+ * Character animation delay in milliseconds
 */
-const MIN_DELAY = 1
-
-/**
- * Maximum delay between characters (when waiting for content)
- */
-const MAX_DELAY = 12
-
-/**
- * Default delay when streaming normally
- */
-const DEFAULT_DELAY = 4
-
-/**
- * How far behind (in characters) before we speed up
- */
-const CATCH_UP_THRESHOLD = 20
-
-/**
- * How close to content before we slow down
- */
-const SLOW_DOWN_THRESHOLD = 5
+const CHARACTER_DELAY = 3

 /**
 * StreamingIndicator shows animated dots during message streaming
- * Used as a standalone indicator when no content has arrived yet
+ * Uses CSS classes for animations to follow best practices
 *
 * @returns Animated loading indicator
 */
 export const StreamingIndicator = memo(() => (
-  <div className='flex h-[1.25rem] items-center text-muted-foreground'>
+  <div className='flex items-center py-1 text-muted-foreground transition-opacity duration-200 ease-in-out'>
    <div className='flex space-x-0.5'>
      <div className='h-1 w-1 animate-bounce rounded-full bg-muted-foreground [animation-delay:0ms] [animation-duration:1.2s]' />
      <div className='h-1 w-1 animate-bounce rounded-full bg-muted-foreground [animation-delay:150ms] [animation-duration:1.2s]' />
@@ -54,39 +34,9 @@ interface SmoothStreamingTextProps {
  isStreaming: boolean
 }

-/**
- * Calculates adaptive delay based on how far behind animation is from actual content
- *
- * @param displayedLength - Current displayed content length
- * @param totalLength - Total available content length
- * @returns Delay in milliseconds
- */
-function calculateAdaptiveDelay(displayedLength: number, totalLength: number): number {
-  const charsRemaining = totalLength - displayedLength
-
-  if (charsRemaining > CATCH_UP_THRESHOLD) {
-    // Far behind - speed up to catch up
-    // Scale from MIN_DELAY to DEFAULT_DELAY based on how far behind
-    const catchUpFactor = Math.min(1, (charsRemaining - CATCH_UP_THRESHOLD) / 50)
-    return MIN_DELAY + (DEFAULT_DELAY - MIN_DELAY) * (1 - catchUpFactor)
-  }
-
-  if (charsRemaining <= SLOW_DOWN_THRESHOLD) {
-    // Close to content edge - slow down to feel natural
-    // The closer we are, the slower we go (up to MAX_DELAY)
-    const slowFactor = 1 - charsRemaining / SLOW_DOWN_THRESHOLD
-    return DEFAULT_DELAY + (MAX_DELAY - DEFAULT_DELAY) * slowFactor
-  }
-
-  // Normal streaming speed
-  return DEFAULT_DELAY
-}
-
 /**
 * SmoothStreamingText component displays text with character-by-character animation
- * Creates a smooth streaming effect for AI responses with adaptive speed
- *
- * Uses adaptive pacing: speeds up when catching up, slows down near content edge
+ * Creates a smooth streaming effect for AI responses
 *
 * @param props - Component props
 * @returns Streaming text with smooth animation
@@ -95,73 +45,74 @@ export const SmoothStreamingText = memo(
  ({ content, isStreaming }: SmoothStreamingTextProps) => {
    const [displayedContent, setDisplayedContent] = useState('')
    const contentRef = useRef(content)
-    const rafRef = useRef<number | null>(null)
+    const timeoutRef = useRef<NodeJS.Timeout | null>(null)
    const indexRef = useRef(0)
-    const lastFrameTimeRef = useRef<number>(0)
+    const streamingStartTimeRef = useRef<number | null>(null)
    const isAnimatingRef = useRef(false)

+    /**
+     * Handles content streaming animation
+     * Updates displayed content character by character during streaming
+     */
    useEffect(() => {
      contentRef.current = content

      if (content.length === 0) {
        setDisplayedContent('')
        indexRef.current = 0
+        streamingStartTimeRef.current = null
        return
      }

      if (isStreaming) {
-        if (indexRef.current < content.length && !isAnimatingRef.current) {
-          isAnimatingRef.current = true
-          lastFrameTimeRef.current = performance.now()
+        if (streamingStartTimeRef.current === null) {
+          streamingStartTimeRef.current = Date.now()
+        }

-          const animateText = (timestamp: number) => {
+        if (indexRef.current < content.length) {
+          const animateText = () => {
            const currentContent = contentRef.current
            const currentIndex = indexRef.current
-            const elapsed = timestamp - lastFrameTimeRef.current

-            // Calculate adaptive delay based on how far behind we are
-            const delay = calculateAdaptiveDelay(currentIndex, currentContent.length)
+            if (currentIndex < currentContent.length) {
+              const chunkSize = 1
+              const newDisplayed = currentContent.slice(0, currentIndex + chunkSize)

-            if (elapsed >= delay) {
-              if (currentIndex < currentContent.length) {
-                const newDisplayed = currentContent.slice(0, currentIndex + 1)
-                setDisplayedContent(newDisplayed)
-                indexRef.current = currentIndex + 1
-                lastFrameTimeRef.current = timestamp
-              }
-            }
+              setDisplayedContent(newDisplayed)
+              indexRef.current = currentIndex + chunkSize

-            if (indexRef.current < currentContent.length) {
-              rafRef.current = requestAnimationFrame(animateText)
+              timeoutRef.current = setTimeout(animateText, CHARACTER_DELAY)
            } else {
              isAnimatingRef.current = false
            }
          }

-          rafRef.current = requestAnimationFrame(animateText)
-        } else if (indexRef.current < content.length && isAnimatingRef.current) {
-          // Animation already running, it will pick up new content automatically
+          if (!isAnimatingRef.current) {
+            if (timeoutRef.current) {
+              clearTimeout(timeoutRef.current)
+            }
+
+            isAnimatingRef.current = true
+            animateText()
+          }
        }
      } else {
-        // Streaming ended - show full content immediately
-        if (rafRef.current) {
-          cancelAnimationFrame(rafRef.current)
-        }
        setDisplayedContent(content)
        indexRef.current = content.length
        isAnimatingRef.current = false
+        streamingStartTimeRef.current = null
      }

      return () => {
-        if (rafRef.current) {
-          cancelAnimationFrame(rafRef.current)
+        if (timeoutRef.current) {
+          clearTimeout(timeoutRef.current)
        }
        isAnimatingRef.current = false
      }
    }, [content, isStreaming])

    return (
-      <div className='min-h-[1.25rem] max-w-full'>
+      <div className='relative min-h-[1.25rem] max-w-full overflow-hidden'>
        <CopilotMarkdownRenderer content={displayedContent} />
      </div>
    )
@@ -170,6 +121,7 @@ export const SmoothStreamingText = memo(
    // Prevent re-renders during streaming unless content actually changed
    return (
      prevProps.content === nextProps.content && prevProps.isStreaming === nextProps.isStreaming
+      // markdownComponents is now memoized so no need to compare
    )
  }
 )
--- 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
@@ -1,6 +1,6 @@
 'use client'

-import { memo, useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import clsx from 'clsx'
 import { ChevronUp } from 'lucide-react'
 import CopilotMarkdownRenderer from './markdown-renderer'
@@ -8,151 +8,18 @@ import CopilotMarkdownRenderer from './markdown-renderer'
 /**
 * Max height for thinking content before internal scrolling kicks in
 */
-const THINKING_MAX_HEIGHT = 150
-
-/**
- * Height threshold before gradient fade kicks in
- */
-const GRADIENT_THRESHOLD = 100
+const THINKING_MAX_HEIGHT = 200

 /**
 * Interval for auto-scroll during streaming (ms)
 */
-const SCROLL_INTERVAL = 50
+const SCROLL_INTERVAL = 100

 /**
 * Timer update interval in milliseconds
 */
 const TIMER_UPDATE_INTERVAL = 100

-/**
- * Thinking text streaming - much faster than main text
- * Essentially instant with minimal delay
- */
-const THINKING_DELAY = 0.5
-const THINKING_CHARS_PER_FRAME = 3
-
-/**
- * Props for the SmoothThinkingText component
- */
-interface SmoothThinkingTextProps {
-  content: string
-  isStreaming: boolean
-}
-
-/**
- * SmoothThinkingText renders thinking content with fast streaming animation
- * Uses gradient fade at top when content is tall enough
- */
-const SmoothThinkingText = memo(
-  ({ content, isStreaming }: SmoothThinkingTextProps) => {
-    const [displayedContent, setDisplayedContent] = useState('')
-    const [showGradient, setShowGradient] = useState(false)
-    const contentRef = useRef(content)
-    const textRef = useRef<HTMLDivElement>(null)
-    const rafRef = useRef<number | null>(null)
-    const indexRef = useRef(0)
-    const lastFrameTimeRef = useRef<number>(0)
-    const isAnimatingRef = useRef(false)
-
-    useEffect(() => {
-      contentRef.current = content
-
-      if (content.length === 0) {
-        setDisplayedContent('')
-        indexRef.current = 0
-        return
-      }
-
-      if (isStreaming) {
-        if (indexRef.current < content.length && !isAnimatingRef.current) {
-          isAnimatingRef.current = true
-          lastFrameTimeRef.current = performance.now()
-
-          const animateText = (timestamp: number) => {
-            const currentContent = contentRef.current
-            const currentIndex = indexRef.current
-            const elapsed = timestamp - lastFrameTimeRef.current
-
-            if (elapsed >= THINKING_DELAY) {
-              if (currentIndex < currentContent.length) {
-                // Reveal multiple characters per frame for faster streaming
-                const newIndex = Math.min(
-                  currentIndex + THINKING_CHARS_PER_FRAME,
-                  currentContent.length
-                )
-                const newDisplayed = currentContent.slice(0, newIndex)
-                setDisplayedContent(newDisplayed)
-                indexRef.current = newIndex
-                lastFrameTimeRef.current = timestamp
-              }
-            }
-
-            if (indexRef.current < currentContent.length) {
-              rafRef.current = requestAnimationFrame(animateText)
-            } else {
-              isAnimatingRef.current = false
-            }
-          }
-
-          rafRef.current = requestAnimationFrame(animateText)
-        }
-      } else {
-        // Streaming ended - show full content immediately
-        if (rafRef.current) {
-          cancelAnimationFrame(rafRef.current)
-        }
-        setDisplayedContent(content)
-        indexRef.current = content.length
-        isAnimatingRef.current = false
-      }
-
-      return () => {
-        if (rafRef.current) {
-          cancelAnimationFrame(rafRef.current)
-        }
-        isAnimatingRef.current = false
-      }
-    }, [content, isStreaming])
-
-    // Check if content height exceeds threshold for gradient
-    useEffect(() => {
-      if (textRef.current && isStreaming) {
-        const height = textRef.current.scrollHeight
-        setShowGradient(height > GRADIENT_THRESHOLD)
-      } else {
-        setShowGradient(false)
-      }
-    }, [displayedContent, isStreaming])
-
-    // Apply vertical gradient fade at the top only when content is tall enough
-    const gradientStyle =
-      isStreaming && showGradient
-        ? {
-            maskImage: 'linear-gradient(to bottom, transparent 0%, black 30%, black 100%)',
-            WebkitMaskImage: 'linear-gradient(to bottom, transparent 0%, black 30%, black 100%)',
-          }
-        : undefined
-
-    return (
-      <div
-        ref={textRef}
-        className='[&_*]:!text-[var(--text-muted)] [&_*]:!text-[12px] [&_*]:!leading-[1.4] [&_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 font-season text-[12px] text-[var(--text-muted)]'
-        style={gradientStyle}
-      >
-        <CopilotMarkdownRenderer content={displayedContent} />
-      </div>
-    )
-  },
-  (prevProps, nextProps) => {
-    return (
-      prevProps.content === nextProps.content && prevProps.isStreaming === nextProps.isStreaming
-    )
-  }
-)
-
-SmoothThinkingText.displayName = 'SmoothThinkingText'
-
 /**
 * Props for the ThinkingBlock component
 */
@@ -199,8 +66,8 @@ export function ThinkingBlock({
   * Auto-collapses when streaming ends OR when following content arrives
   */
  useEffect(() => {
-    // Collapse if streaming ended, there's following content, or special tags arrived
-    if (!isStreaming || hasFollowingContent || hasSpecialTags) {
+    // Collapse if streaming ended or if there's following content (like a tool call)
+    if (!isStreaming || hasFollowingContent) {
      setIsExpanded(false)
      userCollapsedRef.current = false
      setUserHasScrolledAway(false)
@@ -210,7 +77,7 @@ export function ThinkingBlock({
    if (!userCollapsedRef.current && content && content.trim().length > 0) {
      setIsExpanded(true)
    }
-  }, [isStreaming, content, hasFollowingContent, hasSpecialTags])
+  }, [isStreaming, content, hasFollowingContent])

  // Reset start time when streaming begins
  useEffect(() => {
@@ -246,14 +113,14 @@ export function ThinkingBlock({
      const isNearBottom = distanceFromBottom <= 20

      const delta = scrollTop - lastScrollTopRef.current
-      const movedUp = delta < -1
+      const movedUp = delta < -2

      if (movedUp && !isNearBottom) {
        setUserHasScrolledAway(true)
      }

-      // Re-stick if user scrolls back to bottom with intent
-      if (userHasScrolledAway && isNearBottom && delta > 10) {
+      // Re-stick if user scrolls back to bottom
+      if (userHasScrolledAway && isNearBottom) {
        setUserHasScrolledAway(false)
      }

@@ -266,7 +133,7 @@ export function ThinkingBlock({
    return () => container.removeEventListener('scroll', handleScroll)
  }, [isExpanded, userHasScrolledAway])

-  // Smart auto-scroll: always scroll to bottom while streaming unless user scrolled away
+  // Smart auto-scroll: only scroll if user hasn't scrolled away
  useEffect(() => {
    if (!isStreaming || !isExpanded || userHasScrolledAway) return

@@ -274,14 +141,20 @@ export function ThinkingBlock({
      const container = scrollContainerRef.current
      if (!container) return

-      programmaticScrollRef.current = true
-      container.scrollTo({
-        top: container.scrollHeight,
-        behavior: 'auto',
-      })
-      window.setTimeout(() => {
-        programmaticScrollRef.current = false
-      }, 16)
+      const { scrollTop, scrollHeight, clientHeight } = container
+      const distanceFromBottom = scrollHeight - scrollTop - clientHeight
+      const isNearBottom = distanceFromBottom <= 50
+
+      if (isNearBottom) {
+        programmaticScrollRef.current = true
+        container.scrollTo({
+          top: container.scrollHeight,
+          behavior: 'smooth',
+        })
+        window.setTimeout(() => {
+          programmaticScrollRef.current = false
+        }, 150)
+      }
    }, SCROLL_INTERVAL)

    return () => window.clearInterval(intervalId)
@@ -368,11 +241,15 @@ export function ThinkingBlock({
        <div
          ref={scrollContainerRef}
          className={clsx(
-            'overflow-y-auto transition-all duration-150 ease-out',
-            isExpanded ? 'mt-1.5 max-h-[150px] opacity-100' : 'max-h-0 opacity-0'
+            'overflow-y-auto transition-all duration-300 ease-in-out',
+            isExpanded ? 'mt-1.5 max-h-[200px] opacity-100' : 'max-h-0 opacity-0'
          )}
        >
-          <SmoothThinkingText content={content} isStreaming={isStreaming && !hasFollowingContent} />
+          {/* Render markdown during streaming with thinking text styling */}
+          <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>
        </div>
      </div>
    )
@@ -404,12 +281,12 @@ export function ThinkingBlock({
      <div
        ref={scrollContainerRef}
        className={clsx(
-          'overflow-y-auto transition-all duration-150 ease-out',
-          isExpanded ? 'mt-1.5 max-h-[150px] opacity-100' : 'max-h-0 opacity-0'
+          'overflow-y-auto transition-all duration-300 ease-in-out',
+          isExpanded ? 'mt-1.5 max-h-[200px] opacity-100' : 'max-h-0 opacity-0'
        )}
      >
-        {/* Completed thinking text - dimmed with markdown */}
-        <div className='[&_*]:!text-[var(--text-muted)] [&_*]:!text-[12px] [&_*]:!leading-[1.4] [&_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 font-season text-[12px] text-[var(--text-muted)]'>
+        {/* Use markdown renderer for completed content */}
+        <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>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
@@ -187,7 +187,6 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
    )

    // Memoize content blocks to avoid re-rendering unchanged blocks
-    // No entrance animations to prevent layout shift
    const memoizedContentBlocks = useMemo(() => {
      if (!message.contentBlocks || message.contentBlocks.length === 0) {
        return null
@@ -206,10 +205,14 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(

          // Use smooth streaming for the last text block if we're streaming
          const shouldUseSmoothing = isStreaming && isLastTextBlock
-          const blockKey = `text-${index}-${block.timestamp || index}`

          return (
-            <div key={blockKey} className='w-full max-w-full'>
+            <div
+              key={`text-${index}-${block.timestamp || index}`}
+              className={`w-full max-w-full overflow-hidden transition-opacity duration-200 ease-in-out ${
+                cleanBlockContent.length > 0 ? 'opacity-100' : 'opacity-70'
+              } ${shouldUseSmoothing ? 'translate-y-0 transition-transform duration-100 ease-out' : ''}`}
+            >
              {shouldUseSmoothing ? (
                <SmoothStreamingText content={cleanBlockContent} isStreaming={isStreaming} />
              ) : (
@@ -221,33 +224,29 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        if (block.type === 'thinking') {
          // Check if there are any blocks after this one (tool calls, text, etc.)
          const hasFollowingContent = index < message.contentBlocks!.length - 1
-          // Check if special tags (options, plan) are present - should also close thinking
-          const hasSpecialTags = !!(parsedTags?.options || parsedTags?.plan)
-          const blockKey = `thinking-${index}-${block.timestamp || index}`
-
          return (
-            <div key={blockKey} className='w-full'>
+            <div key={`thinking-${index}-${block.timestamp || index}`} className='w-full'>
              <ThinkingBlock
                content={block.content}
                isStreaming={isStreaming}
                hasFollowingContent={hasFollowingContent}
-                hasSpecialTags={hasSpecialTags}
              />
            </div>
          )
        }
        if (block.type === 'tool_call') {
-          const blockKey = `tool-${block.toolCall.id}`
-
          return (
-            <div key={blockKey}>
+            <div
+              key={`tool-${block.toolCall.id}`}
+              className='opacity-100 transition-opacity duration-300 ease-in-out'
+            >
              <ToolCall toolCallId={block.toolCall.id} toolCall={block.toolCall} />
            </div>
          )
        }
        return null
      })
-    }, [message.contentBlocks, isStreaming, parsedTags])
+    }, [message.contentBlocks, isStreaming])

    if (isUser) {
      return (
@@ -280,7 +279,6 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
                onModeChange={setMode}
                panelWidth={panelWidth}
                clearOnSubmit={false}
-                initialContexts={message.contexts}
              />

              {/* Inline Checkpoint Discard Confirmation - shown below input in edit mode */}
@@ -348,18 +346,14 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
                    const contexts: any[] = Array.isArray((message as any).contexts)
                      ? ((message as any).contexts as any[])
                      : []
-
-                    // Build tokens with their prefixes (@ for mentions, / for commands)
-                    const tokens = contexts
-                      .filter((c) => c?.kind !== 'current_workflow' && c?.label)
-                      .map((c) => {
-                        const prefix = c?.kind === 'slash_command' ? '/' : '@'
-                        return `${prefix}${c.label}`
-                      })
-                    if (!tokens.length) return text
+                    const labels = contexts
+                      .filter((c) => c?.kind !== 'current_workflow')
+                      .map((c) => c?.label)
+                      .filter(Boolean) as string[]
+                    if (!labels.length) return text

                    const escapeRegex = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-                    const pattern = new RegExp(`(${tokens.map(escapeRegex).join('|')})`, 'g')
+                    const pattern = new RegExp(`@(${labels.map(escapeRegex).join('|')})`, 'g')

                    const nodes: React.ReactNode[] = []
                    let lastIndex = 0
@@ -466,29 +460,17 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
      )
    }

-    // Check if there's any visible content in the blocks
-    const hasVisibleContent = useMemo(() => {
-      if (!message.contentBlocks || message.contentBlocks.length === 0) return false
-      return message.contentBlocks.some((block) => {
-        if (block.type === 'text') {
-          const parsed = parseSpecialTags(block.content)
-          return parsed.cleanContent.trim().length > 0
-        }
-        return block.type === 'thinking' || block.type === 'tool_call'
-      })
-    }, [message.contentBlocks])
-
    if (isAssistant) {
      return (
        <div
-          className={`w-full max-w-full overflow-hidden [max-width:var(--panel-max-width)] ${isDimmed ? 'opacity-40' : 'opacity-100'}`}
+          className={`w-full max-w-full overflow-hidden transition-opacity duration-200 [max-width:var(--panel-max-width)] ${isDimmed ? 'opacity-40' : 'opacity-100'}`}
          style={{ '--panel-max-width': `${panelWidth - 16}px` } as React.CSSProperties}
        >
-          <div className='max-w-full space-y-1 px-[2px]'>
+          <div className='max-w-full space-y-1.5 px-[2px] transition-all duration-200 ease-in-out'>
            {/* Content blocks in chronological order */}
            {memoizedContentBlocks}

-            {/* Streaming indicator always at bottom during streaming */}
+            {/* Always show streaming indicator at the end while streaming */}
            {isStreaming && <StreamingIndicator />}

            {message.errorType === 'usage_limit' && (
--- 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
@@ -497,11 +497,6 @@ const ACTION_VERBS = [
  'Accessed',
  'Managing',
  'Managed',
-  'Scraping',
-  'Scraped',
-  'Crawling',
-  'Crawled',
-  'Getting',
 ] as const

 /**
@@ -1066,7 +1061,7 @@ function SubAgentContent({
      <div
        ref={scrollContainerRef}
        className={clsx(
-          'overflow-y-auto transition-all duration-150 ease-out',
+          'overflow-y-auto transition-all duration-300 ease-in-out',
          isExpanded ? 'mt-1.5 max-h-[200px] opacity-100' : 'max-h-0 opacity-0'
        )}
      >
@@ -1162,10 +1157,10 @@ function SubAgentThinkingContent({

 /**
 * Subagents that should collapse when done streaming.
- * Default behavior is to NOT collapse (stay expanded like edit, superagent, info, etc.).
- * Only plan, debug, and research collapse into summary headers.
+ * Default behavior is to NOT collapse (stay expanded like edit).
+ * Only these specific subagents collapse into "Planned for Xs >" style headers.
 */
-const COLLAPSIBLE_SUBAGENTS = new Set(['plan', 'debug', 'research'])
+const COLLAPSIBLE_SUBAGENTS = new Set(['plan', 'debug', 'research', 'info'])

 /**
 * SubagentContentRenderer handles the rendering of subagent content.
@@ -1326,7 +1321,7 @@ function SubagentContentRenderer({

      <div
        className={clsx(
-          'overflow-hidden transition-all duration-150 ease-out',
+          'overflow-hidden transition-all duration-300 ease-in-out',
          isExpanded ? 'mt-1.5 max-h-[5000px] opacity-100' : 'max-h-0 opacity-0'
        )}
      >
@@ -1636,8 +1631,10 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
 * Checks if a tool is an integration tool (server-side executed, not a client tool)
 */
 function isIntegrationTool(toolName: string): boolean {
-  // Any tool NOT in CLASS_TOOL_METADATA is an integration tool (server-side execution)
-  return !CLASS_TOOL_METADATA[toolName]
+  // Check if it's NOT a client tool (not in CLASS_TOOL_METADATA and not in registered tools)
+  const isClientTool = !!CLASS_TOOL_METADATA[toolName]
+  const isRegisteredTool = !!getRegisteredTools()[toolName]
+  return !isClientTool && !isRegisteredTool
 }

 function shouldShowRunSkipButtons(toolCall: CopilotToolCall): boolean {
@@ -1666,9 +1663,16 @@ function shouldShowRunSkipButtons(toolCall: CopilotToolCall): boolean {
    return true
  }

-  // Always show buttons for integration tools in pending state (they need user confirmation)
+  // Also show buttons for integration tools in pending state (they need user confirmation)
+  // But NOT if the tool is auto-allowed (it will auto-execute)
  const mode = useCopilotStore.getState().mode
-  if (mode === 'build' && isIntegrationTool(toolCall.name) && toolCall.state === 'pending') {
+  const isAutoAllowed = useCopilotStore.getState().isToolAutoAllowed(toolCall.name)
+  if (
+    mode === 'build' &&
+    isIntegrationTool(toolCall.name) &&
+    toolCall.state === 'pending' &&
+    !isAutoAllowed
+  ) {
    return true
  }

@@ -1891,20 +1895,15 @@ function RunSkipButtons({

  if (buttonsHidden) return null

-  // Hide "Always Allow" for integration tools (only show for client tools with interrupts)
-  const showAlwaysAllow = !isIntegrationTool(toolCall.name)
-
-  // Standardized buttons for all interrupt tools: Allow, (Always Allow for client tools only), Skip
+  // Standardized buttons for all interrupt tools: Allow, Always Allow, Skip
  return (
    <div className='mt-1.5 flex gap-[6px]'>
      <Button onClick={onRun} disabled={isProcessing} variant='tertiary'>
        {isProcessing ? 'Allowing...' : 'Allow'}
      </Button>
-      {showAlwaysAllow && (
-        <Button onClick={onAlwaysAllow} disabled={isProcessing} variant='default'>
-          {isProcessing ? 'Allowing...' : 'Always Allow'}
-        </Button>
-      )}
+      <Button onClick={onAlwaysAllow} disabled={isProcessing} variant='default'>
+        {isProcessing ? 'Allowing...' : 'Always Allow'}
+      </Button>
      <Button onClick={onSkip} disabled={isProcessing} variant='default'>
        Skip
      </Button>
@@ -1970,7 +1969,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
    'tour',
    'info',
    'workflow',
-    'superagent',
  ]
  const isSubagentTool = SUBAGENT_TOOLS.includes(toolCall.name)

@@ -2598,23 +2596,16 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
    }
  }

-  // For edit_workflow, hide text display when we have operations (WorkflowEditSummary replaces it)
-  const isEditWorkflow = toolCall.name === 'edit_workflow'
-  const hasOperations = Array.isArray(params.operations) && params.operations.length > 0
-  const hideTextForEditWorkflow = isEditWorkflow && hasOperations
-
  return (
    <div className='w-full'>
-      {!hideTextForEditWorkflow && (
-        <div className={isToolNameClickable ? 'cursor-pointer' : ''} onClick={handleToolNameClick}>
-          <ShimmerOverlayText
-            text={displayName}
-            active={isLoadingState}
-            isSpecial={isSpecial}
-            className='font-[470] font-season text-[var(--text-secondary)] text-sm dark:text-[var(--text-muted)]'
-          />
-        </div>
-      )}
+      <div className={isToolNameClickable ? 'cursor-pointer' : ''} onClick={handleToolNameClick}>
+        <ShimmerOverlayText
+          text={displayName}
+          active={isLoadingState}
+          isSpecial={isSpecial}
+          className='font-[470] font-season text-[var(--text-secondary)] text-sm dark:text-[var(--text-muted)]'
+        />
+      </div>
      {isExpandableTool && expanded && <div className='mt-1.5'>{renderPendingDetails()}</div>}
      {showRemoveAutoAllow && isAutoAllowed && (
        <div className='mt-1.5'>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/index.ts
@@ -3,4 +3,3 @@ export { ContextPills } from './context-pills/context-pills'
 export { MentionMenu } from './mention-menu/mention-menu'
 export { ModeSelector } from './mode-selector/mode-selector'
 export { ModelSelector } from './model-selector/model-selector'
-export { SlashMenu } from './slash-menu/slash-menu'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mention-menu/mention-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mention-menu/mention-menu.tsx
@@ -26,14 +26,26 @@ function formatTimestamp(iso: string): string {
  }
 }

+/**
+ * Common text styling for loading and empty states
+ */
 const STATE_TEXT_CLASSES = 'px-[8px] py-[8px] text-[12px] text-[var(--text-muted)]'

+/**
+ * Loading state component for mention folders
+ */
 const LoadingState = () => <div className={STATE_TEXT_CLASSES}>Loading...</div>

+/**
+ * Empty state component for mention folders
+ */
 const EmptyState = ({ message }: { message: string }) => (
  <div className={STATE_TEXT_CLASSES}>{message}</div>
 )

+/**
+ * Aggregated item type for filtered results
+ */
 interface AggregatedItem {
  id: string
  label: string
@@ -66,6 +78,14 @@ interface MentionMenuProps {
  }
 }

+/**
+ * MentionMenu component for mention menu dropdown.
+ * Handles rendering of mention options, submenus, and aggregated search results.
+ * Manages keyboard navigation and selection of mentions.
+ *
+ * @param props - Component props
+ * @returns Rendered mention menu
+ */
 export function MentionMenu({
  mentionMenu,
  mentionData,
@@ -80,7 +100,6 @@ export function MentionMenu({
    submenuActiveIndex,
    mentionActiveIndex,
    openSubmenuFor,
-    setOpenSubmenuFor,
  } = mentionMenu

  const {
@@ -289,55 +308,72 @@ export function MentionMenu({
    'Docs', // 7
  ] as const

+  // Get active folder based on navigation when not in submenu and no query
  const isInFolderNavigationMode = !openSubmenuFor && !showAggregatedView

+  // Compute caret viewport position via mirror technique for precise anchoring
  const textareaEl = mentionMenu.textareaRef.current
  if (!textareaEl) return null

-  const caretPos = getCaretPos()
-  const textareaRect = textareaEl.getBoundingClientRect()
-  const style = window.getComputedStyle(textareaEl)
+  const getCaretViewport = (textarea: HTMLTextAreaElement, caretPosition: number, text: string) => {
+    const textareaRect = textarea.getBoundingClientRect()
+    const style = window.getComputedStyle(textarea)

-  const mirrorDiv = document.createElement('div')
-  mirrorDiv.style.position = 'absolute'
-  mirrorDiv.style.visibility = 'hidden'
-  mirrorDiv.style.whiteSpace = 'pre-wrap'
-  mirrorDiv.style.wordWrap = 'break-word'
-  mirrorDiv.style.font = style.font
-  mirrorDiv.style.padding = style.padding
-  mirrorDiv.style.border = style.border
-  mirrorDiv.style.width = style.width
-  mirrorDiv.style.lineHeight = style.lineHeight
-  mirrorDiv.style.boxSizing = style.boxSizing
-  mirrorDiv.style.letterSpacing = style.letterSpacing
-  mirrorDiv.style.textTransform = style.textTransform
-  mirrorDiv.style.textIndent = style.textIndent
-  mirrorDiv.style.textAlign = style.textAlign
-  mirrorDiv.textContent = message.substring(0, caretPos)
+    const mirrorDiv = document.createElement('div')
+    mirrorDiv.style.position = 'absolute'
+    mirrorDiv.style.visibility = 'hidden'
+    mirrorDiv.style.whiteSpace = 'pre-wrap'
+    mirrorDiv.style.wordWrap = 'break-word'
+    mirrorDiv.style.font = style.font
+    mirrorDiv.style.padding = style.padding
+    mirrorDiv.style.border = style.border
+    mirrorDiv.style.width = style.width
+    mirrorDiv.style.lineHeight = style.lineHeight
+    mirrorDiv.style.boxSizing = style.boxSizing
+    mirrorDiv.style.letterSpacing = style.letterSpacing
+    mirrorDiv.style.textTransform = style.textTransform
+    mirrorDiv.style.textIndent = style.textIndent
+    mirrorDiv.style.textAlign = style.textAlign

-  const caretMarker = document.createElement('span')
-  caretMarker.style.display = 'inline-block'
-  caretMarker.style.width = '0px'
-  caretMarker.style.padding = '0'
-  caretMarker.style.border = '0'
-  mirrorDiv.appendChild(caretMarker)
+    mirrorDiv.textContent = text.substring(0, caretPosition)

-  document.body.appendChild(mirrorDiv)
-  const markerRect = caretMarker.getBoundingClientRect()
-  const mirrorRect = mirrorDiv.getBoundingClientRect()
-  document.body.removeChild(mirrorDiv)
+    const caretMarker = document.createElement('span')
+    caretMarker.style.display = 'inline-block'
+    caretMarker.style.width = '0px'
+    caretMarker.style.padding = '0'
+    caretMarker.style.border = '0'
+    mirrorDiv.appendChild(caretMarker)

-  const caretViewport = {
-    left: textareaRect.left + (markerRect.left - mirrorRect.left) - textareaEl.scrollLeft,
-    top: textareaRect.top + (markerRect.top - mirrorRect.top) - textareaEl.scrollTop,
+    document.body.appendChild(mirrorDiv)
+    const markerRect = caretMarker.getBoundingClientRect()
+    const mirrorRect = mirrorDiv.getBoundingClientRect()
+    document.body.removeChild(mirrorDiv)
+
+    const leftOffset = markerRect.left - mirrorRect.left - textarea.scrollLeft
+    const topOffset = markerRect.top - mirrorRect.top - textarea.scrollTop
+
+    return {
+      left: textareaRect.left + leftOffset,
+      top: textareaRect.top + topOffset,
+    }
  }

+  const caretPos = getCaretPos()
+  const caretViewport = getCaretViewport(textareaEl, caretPos, message)
+
+  // Decide preferred side based on available space
  const margin = 8
+  const spaceAbove = caretViewport.top - margin
  const spaceBelow = window.innerHeight - caretViewport.top - margin
-  const side: 'top' | 'bottom' = spaceBelow >= caretViewport.top - margin ? 'bottom' : 'top'
+  const side: 'top' | 'bottom' = spaceBelow >= spaceAbove ? 'bottom' : 'top'

  return (
-    <Popover open={open} onOpenChange={() => {}}>
+    <Popover
+      open={open}
+      onOpenChange={() => {
+        /* controlled by mentionMenu */
+      }}
+    >
      <PopoverAnchor asChild>
        <div
          style={{
@@ -363,7 +399,7 @@ export function MentionMenu({
        onOpenAutoFocus={(e) => e.preventDefault()}
        onCloseAutoFocus={(e) => e.preventDefault()}
      >
-        <PopoverBackButton onClick={() => setOpenSubmenuFor(null)} />
+        <PopoverBackButton />
        <PopoverScrollArea ref={menuListRef} className='space-y-[2px]'>
          {openSubmenuFor ? (
            // Submenu view - showing contents of a specific folder
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/slash-menu/slash-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/slash-menu/slash-menu.tsx
@@ -1,206 +0,0 @@
-'use client'
-
-import { useMemo } from 'react'
-import {
-  Popover,
-  PopoverAnchor,
-  PopoverBackButton,
-  PopoverContent,
-  PopoverFolder,
-  PopoverItem,
-  PopoverScrollArea,
-} from '@/components/emcn'
-import type { useMentionMenu } from '../../hooks/use-mention-menu'
-
-const TOP_LEVEL_COMMANDS = [
-  { id: 'fast', label: 'Fast' },
-  { id: 'research', label: 'Research' },
-  { id: 'superagent', label: 'Actions' },
-] as const
-
-const WEB_COMMANDS = [
-  { id: 'search', label: 'Search' },
-  { id: 'read', label: 'Read' },
-  { id: 'scrape', label: 'Scrape' },
-  { id: 'crawl', label: 'Crawl' },
-] as const
-
-const ALL_COMMANDS = [...TOP_LEVEL_COMMANDS, ...WEB_COMMANDS]
-
-interface SlashMenuProps {
-  mentionMenu: ReturnType<typeof useMentionMenu>
-  message: string
-  onSelectCommand: (command: string) => void
-}
-
-export function SlashMenu({ mentionMenu, message, onSelectCommand }: SlashMenuProps) {
-  const {
-    mentionMenuRef,
-    menuListRef,
-    getActiveSlashQueryAtPosition,
-    getCaretPos,
-    submenuActiveIndex,
-    mentionActiveIndex,
-    openSubmenuFor,
-    setOpenSubmenuFor,
-  } = mentionMenu
-
-  const currentQuery = useMemo(() => {
-    const caretPos = getCaretPos()
-    const active = getActiveSlashQueryAtPosition(caretPos, message)
-    return active?.query.trim().toLowerCase() || ''
-  }, [message, getCaretPos, getActiveSlashQueryAtPosition])
-
-  const filteredCommands = useMemo(() => {
-    if (!currentQuery) return null
-    return ALL_COMMANDS.filter(
-      (cmd) =>
-        cmd.id.toLowerCase().includes(currentQuery) ||
-        cmd.label.toLowerCase().includes(currentQuery)
-    )
-  }, [currentQuery])
-
-  const showAggregatedView = currentQuery.length > 0
-  const isInFolderNavigationMode = !openSubmenuFor && !showAggregatedView
-
-  const textareaEl = mentionMenu.textareaRef.current
-  if (!textareaEl) return null
-
-  const caretPos = getCaretPos()
-  const textareaRect = textareaEl.getBoundingClientRect()
-  const style = window.getComputedStyle(textareaEl)
-
-  const mirrorDiv = document.createElement('div')
-  mirrorDiv.style.position = 'absolute'
-  mirrorDiv.style.visibility = 'hidden'
-  mirrorDiv.style.whiteSpace = 'pre-wrap'
-  mirrorDiv.style.wordWrap = 'break-word'
-  mirrorDiv.style.font = style.font
-  mirrorDiv.style.padding = style.padding
-  mirrorDiv.style.border = style.border
-  mirrorDiv.style.width = style.width
-  mirrorDiv.style.lineHeight = style.lineHeight
-  mirrorDiv.style.boxSizing = style.boxSizing
-  mirrorDiv.style.letterSpacing = style.letterSpacing
-  mirrorDiv.style.textTransform = style.textTransform
-  mirrorDiv.style.textIndent = style.textIndent
-  mirrorDiv.style.textAlign = style.textAlign
-  mirrorDiv.textContent = message.substring(0, caretPos)
-
-  const caretMarker = document.createElement('span')
-  caretMarker.style.display = 'inline-block'
-  caretMarker.style.width = '0px'
-  caretMarker.style.padding = '0'
-  caretMarker.style.border = '0'
-  mirrorDiv.appendChild(caretMarker)
-
-  document.body.appendChild(mirrorDiv)
-  const markerRect = caretMarker.getBoundingClientRect()
-  const mirrorRect = mirrorDiv.getBoundingClientRect()
-  document.body.removeChild(mirrorDiv)
-
-  const caretViewport = {
-    left: textareaRect.left + (markerRect.left - mirrorRect.left) - textareaEl.scrollLeft,
-    top: textareaRect.top + (markerRect.top - mirrorRect.top) - textareaEl.scrollTop,
-  }
-
-  const margin = 8
-  const spaceBelow = window.innerHeight - caretViewport.top - margin
-  const side: 'top' | 'bottom' = spaceBelow >= caretViewport.top - margin ? 'bottom' : 'top'
-
-  return (
-    <Popover open={true} onOpenChange={() => {}}>
-      <PopoverAnchor asChild>
-        <div
-          style={{
-            position: 'fixed',
-            top: `${caretViewport.top}px`,
-            left: `${caretViewport.left}px`,
-            width: '1px',
-            height: '1px',
-            pointerEvents: 'none',
-          }}
-        />
-      </PopoverAnchor>
-      <PopoverContent
-        ref={mentionMenuRef}
-        side={side}
-        align='start'
-        collisionPadding={6}
-        maxHeight={360}
-        className='pointer-events-auto'
-        style={{
-          width: `180px`,
-        }}
-        onOpenAutoFocus={(e) => e.preventDefault()}
-        onCloseAutoFocus={(e) => e.preventDefault()}
-      >
-        <PopoverBackButton onClick={() => setOpenSubmenuFor(null)} />
-        <PopoverScrollArea ref={menuListRef} className='space-y-[2px]'>
-          {openSubmenuFor === 'Web' ? (
-            <>
-              {WEB_COMMANDS.map((cmd, index) => (
-                <PopoverItem
-                  key={cmd.id}
-                  onClick={() => onSelectCommand(cmd.id)}
-                  data-idx={index}
-                  active={index === submenuActiveIndex}
-                >
-                  <span className='truncate'>{cmd.label}</span>
-                </PopoverItem>
-              ))}
-            </>
-          ) : showAggregatedView ? (
-            <>
-              {filteredCommands && filteredCommands.length === 0 ? (
-                <div className='px-[8px] py-[8px] text-[12px] text-[var(--text-muted)]'>
-                  No commands found
-                </div>
-              ) : (
-                filteredCommands?.map((cmd, index) => (
-                  <PopoverItem
-                    key={cmd.id}
-                    onClick={() => onSelectCommand(cmd.id)}
-                    data-idx={index}
-                    active={index === submenuActiveIndex}
-                  >
-                    <span className='truncate'>{cmd.label}</span>
-                  </PopoverItem>
-                ))
-              )}
-            </>
-          ) : (
-            <>
-              {TOP_LEVEL_COMMANDS.map((cmd, index) => (
-                <PopoverItem
-                  key={cmd.id}
-                  onClick={() => onSelectCommand(cmd.id)}
-                  data-idx={index}
-                  active={isInFolderNavigationMode && index === mentionActiveIndex}
-                >
-                  <span className='truncate'>{cmd.label}</span>
-                </PopoverItem>
-              ))}
-
-              <PopoverFolder
-                id='web'
-                title='Web'
-                onOpen={() => setOpenSubmenuFor('Web')}
-                active={
-                  isInFolderNavigationMode && mentionActiveIndex === TOP_LEVEL_COMMANDS.length
-                }
-                data-idx={TOP_LEVEL_COMMANDS.length}
-              >
-                {WEB_COMMANDS.map((cmd) => (
-                  <PopoverItem key={cmd.id} onClick={() => onSelectCommand(cmd.id)}>
-                    <span className='truncate'>{cmd.label}</span>
-                  </PopoverItem>
-                ))}
-              </PopoverFolder>
-            </>
-          )}
-        </PopoverScrollArea>
-      </PopoverContent>
-    </Popover>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-context-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-context-management.ts
@@ -1,11 +1,9 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import type { ChatContext } from '@/stores/panel'

 interface UseContextManagementProps {
  /** Current message text */
  message: string
-  /** Initial contexts to populate when editing a message */
-  initialContexts?: ChatContext[]
 }

 /**
@@ -15,17 +13,8 @@ interface UseContextManagementProps {
 * @param props - Configuration object
 * @returns Context state and management functions
 */
-export function useContextManagement({ message, initialContexts }: UseContextManagementProps) {
-  const [selectedContexts, setSelectedContexts] = useState<ChatContext[]>(initialContexts ?? [])
-  const initializedRef = useRef(false)
-
-  // Initialize with initial contexts when they're first provided (for edit mode)
-  useEffect(() => {
-    if (initialContexts && initialContexts.length > 0 && !initializedRef.current) {
-      setSelectedContexts(initialContexts)
-      initializedRef.current = true
-    }
-  }, [initialContexts])
+export function useContextManagement({ message }: UseContextManagementProps) {
+  const [selectedContexts, setSelectedContexts] = useState<ChatContext[]>([])

  /**
   * Adds a context to the selected contexts list, avoiding duplicates
@@ -74,9 +63,6 @@ export function useContextManagement({ message, initialContexts }: UseContextMan
          if (c.kind === 'docs') {
            return true // Only one docs context allowed
          }
-          if (c.kind === 'slash_command' && 'command' in context && 'command' in c) {
-            return c.command === (context as any).command
-          }
        }

        return false
@@ -117,8 +103,6 @@ export function useContextManagement({ message, initialContexts }: UseContextMan
            return (c as any).executionId !== (contextToRemove as any).executionId
          case 'docs':
            return false // Remove docs (only one docs context)
-          case 'slash_command':
-            return (c as any).command !== (contextToRemove as any).command
          default:
            return c.label !== contextToRemove.label
        }
@@ -134,7 +118,7 @@ export function useContextManagement({ message, initialContexts }: UseContextMan
  }, [])

  /**
-   * Synchronizes selected contexts with inline @label or /label tokens in the message.
+   * Synchronizes selected contexts with inline @label tokens in the message.
   * Removes contexts whose labels are no longer present in the message.
   */
  useEffect(() => {
@@ -146,16 +130,17 @@ export function useContextManagement({ message, initialContexts }: UseContextMan
    setSelectedContexts((prev) => {
      if (prev.length === 0) return prev

-      const filtered = prev.filter((c) => {
-        if (!c.label) return false
-        // Check for slash command tokens or mention tokens based on kind
-        const isSlashCommand = c.kind === 'slash_command'
-        const prefix = isSlashCommand ? '/' : '@'
-        const tokenWithSpaces = ` ${prefix}${c.label} `
-        const tokenAtStart = `${prefix}${c.label} `
-        // Token can appear with leading space OR at the start of the message
-        return message.includes(tokenWithSpaces) || message.startsWith(tokenAtStart)
-      })
+      const presentLabels = new Set<string>()
+      const labels = prev.map((c) => c.label).filter(Boolean)
+
+      for (const label of labels) {
+        const token = ` @${label} `
+        if (message.includes(token)) {
+          presentLabels.add(label)
+        }
+      }
+
+      const filtered = prev.filter((c) => !!c.label && presentLabels.has(c.label))
      return filtered.length === prev.length ? prev : filtered
    })
  }, [message])
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu.ts
@@ -70,25 +70,11 @@ export function useMentionMenu({
      // Ensure '@' starts a token (start or whitespace before)
      if (atIndex > 0 && !/\s/.test(before.charAt(atIndex - 1))) return null

-      // Check if this '@' is part of a completed mention token
+      // Check if this '@' is part of a completed mention token ( @label )
      if (selectedContexts.length > 0) {
-        // Only check non-slash_command contexts for mentions
-        const mentionLabels = selectedContexts
-          .filter((c) => c.kind !== 'slash_command')
-          .map((c) => c.label)
-          .filter(Boolean) as string[]
-
-        for (const label of mentionLabels) {
-          // Check for token at start of text: "@label "
-          if (atIndex === 0) {
-            const startToken = `@${label} `
-            if (text.startsWith(startToken)) {
-              // This @ is part of a completed token
-              return null
-            }
-          }
-
-          // Check for space-wrapped token: " @label "
+        const labels = selectedContexts.map((c) => c.label).filter(Boolean) as string[]
+        for (const label of labels) {
+          // Space-wrapped token: " @label "
          const token = ` @${label} `
          let fromIndex = 0
          while (fromIndex <= text.length) {
@@ -102,6 +88,7 @@ export function useMentionMenu({
            // Check if the @ we found is the @ of this completed token
            if (atIndex === atPositionInToken) {
              // The @ we found is part of a completed mention
+              // Don't show menu - user is typing after the completed mention
              return null
            }

@@ -126,76 +113,6 @@ export function useMentionMenu({
    [message, selectedContexts]
  )

-  /**
-   * Finds active slash command query at the given position
-   *
-   * @param pos - Position in the text to check
-   * @param textOverride - Optional text override (for checking during input)
-   * @returns Active slash query object or null if no active slash command
-   */
-  const getActiveSlashQueryAtPosition = useCallback(
-    (pos: number, textOverride?: string) => {
-      const text = textOverride ?? message
-      const before = text.slice(0, pos)
-      const slashIndex = before.lastIndexOf('/')
-      if (slashIndex === -1) return null
-
-      // Ensure '/' starts a token (start or whitespace before)
-      if (slashIndex > 0 && !/\s/.test(before.charAt(slashIndex - 1))) return null
-
-      // Check if this '/' is part of a completed slash token
-      if (selectedContexts.length > 0) {
-        // Only check slash_command contexts
-        const slashLabels = selectedContexts
-          .filter((c) => c.kind === 'slash_command')
-          .map((c) => c.label)
-          .filter(Boolean) as string[]
-
-        for (const label of slashLabels) {
-          // Check for token at start of text: "/label "
-          if (slashIndex === 0) {
-            const startToken = `/${label} `
-            if (text.startsWith(startToken)) {
-              // This slash is part of a completed token
-              return null
-            }
-          }
-
-          // Check for space-wrapped token: " /label "
-          const token = ` /${label} `
-          let fromIndex = 0
-          while (fromIndex <= text.length) {
-            const idx = text.indexOf(token, fromIndex)
-            if (idx === -1) break
-
-            const tokenStart = idx
-            const tokenEnd = idx + token.length
-            const slashPositionInToken = idx + 1 // position of / in " /label "
-
-            if (slashIndex === slashPositionInToken) {
-              return null
-            }
-
-            if (pos > tokenStart && pos < tokenEnd) {
-              return null
-            }
-
-            fromIndex = tokenEnd
-          }
-        }
-      }
-
-      const segment = before.slice(slashIndex + 1)
-      // Close the popup if user types space immediately after /
-      if (segment.length > 0 && /^\s/.test(segment)) {
-        return null
-      }
-
-      return { query: segment, start: slashIndex, end: pos }
-    },
-    [message, selectedContexts]
-  )
-
  /**
   * Gets the submenu query text
   *
@@ -283,10 +200,9 @@ export function useMentionMenu({
      const before = message.slice(0, active.start)
      const after = message.slice(active.end)

-      // Add leading space only if not at start and previous char isn't whitespace
-      const needsLeadingSpace = before.length > 0 && !before.endsWith(' ')
-      // Always add trailing space for easy continued typing
-      const insertion = `${needsLeadingSpace ? ' ' : ''}@${label}  `
+      // Always include leading space, avoid duplicate if one exists
+      const needsLeadingSpace = !before.endsWith(' ')
+      const insertion = `${needsLeadingSpace ? ' ' : ''}@${label} `

      const next = `${before}${insertion}${after}`
      onMessageChange(next)
@@ -301,41 +217,6 @@ export function useMentionMenu({
    [message, getActiveMentionQueryAtPosition, onMessageChange]
  )

-  /**
-   * Replaces active slash command with a label
-   *
-   * @param label - Label to replace the slash command with
-   * @returns True if replacement was successful, false if no active slash command found
-   */
-  const replaceActiveSlashWith = useCallback(
-    (label: string) => {
-      const textarea = textareaRef.current
-      if (!textarea) return false
-      const pos = textarea.selectionStart ?? message.length
-      const active = getActiveSlashQueryAtPosition(pos)
-      if (!active) return false
-
-      const before = message.slice(0, active.start)
-      const after = message.slice(active.end)
-
-      // Add leading space only if not at start and previous char isn't whitespace
-      const needsLeadingSpace = before.length > 0 && !before.endsWith(' ')
-      // Always add trailing space for easy continued typing
-      const insertion = `${needsLeadingSpace ? ' ' : ''}/${label}  `
-
-      const next = `${before}${insertion}${after}`
-      onMessageChange(next)
-
-      setTimeout(() => {
-        const cursorPos = before.length + insertion.length
-        textarea.setSelectionRange(cursorPos, cursorPos)
-        textarea.focus()
-      }, 0)
-      return true
-    },
-    [message, getActiveSlashQueryAtPosition, onMessageChange]
-  )
-
  /**
   * Scrolls active item into view in the menu
   *
@@ -423,12 +304,10 @@ export function useMentionMenu({
    // Operations
    getCaretPos,
    getActiveMentionQueryAtPosition,
-    getActiveSlashQueryAtPosition,
    getSubmenuQuery,
    resetActiveMentionQuery,
    insertAtCursor,
    replaceActiveMentionWith,
-    replaceActiveSlashWith,
    scrollActiveItemIntoView,
    closeMentionMenu,
  }
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
@@ -39,7 +39,7 @@ export function useMentionTokens({
  setSelectedContexts,
 }: UseMentionTokensProps) {
  /**
-   * Computes all mention ranges in the message (both @mentions and /commands)
+   * Computes all mention ranges in the message
   *
   * @returns Array of mention ranges sorted by start position
   */
@@ -55,19 +55,8 @@ export function useMentionTokens({
    const uniqueLabels = Array.from(new Set(labels))

    for (const label of uniqueLabels) {
-      // Find matching context to determine if it's a slash command
-      const matchingContext = selectedContexts.find((c) => c.label === label)
-      const isSlashCommand = matchingContext?.kind === 'slash_command'
-      const prefix = isSlashCommand ? '/' : '@'
-
-      // Check for token at the very start of the message (no leading space)
-      const tokenAtStart = `${prefix}${label} `
-      if (message.startsWith(tokenAtStart)) {
-        ranges.push({ start: 0, end: tokenAtStart.length, label })
-      }
-
-      // Space-wrapped token: " @label " or " /label " (search from start)
-      const token = ` ${prefix}${label} `
+      // Space-wrapped token: " @label " (search from start)
+      const token = ` @${label} `
      let fromIndex = 0
      while (fromIndex <= message.length) {
        const idx = message.indexOf(token, fromIndex)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
@@ -21,7 +21,6 @@ import {
  MentionMenu,
  ModelSelector,
  ModeSelector,
-  SlashMenu,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components'
 import { NEAR_TOP_THRESHOLD } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/constants'
 import {
@@ -40,24 +39,6 @@ import { useCopilotStore } from '@/stores/panel'

 const logger = createLogger('CopilotUserInput')

-const TOP_LEVEL_COMMANDS = ['fast', 'research', 'superagent'] as const
-const WEB_COMMANDS = ['search', 'read', 'scrape', 'crawl'] as const
-const ALL_COMMANDS = [...TOP_LEVEL_COMMANDS, ...WEB_COMMANDS]
-
-const COMMAND_DISPLAY_LABELS: Record<string, string> = {
-  superagent: 'Actions',
-}
-
-/**
- * Calculates the next index for circular navigation (wraps around at bounds)
- */
-function getNextIndex(current: number, direction: 'up' | 'down', maxIndex: number): number {
-  if (direction === 'down') {
-    return current >= maxIndex ? 0 : current + 1
-  }
-  return current <= 0 ? maxIndex : current - 1
-}
-
 interface UserInputProps {
  onSubmit: (
    message: string,
@@ -86,8 +67,6 @@ interface UserInputProps {
  hideModeSelector?: boolean
  /** Disable @mention functionality */
  disableMentions?: boolean
-  /** Initial contexts for editing a message with existing context mentions */
-  initialContexts?: ChatContext[]
 }

 interface UserInputRef {
@@ -124,10 +103,10 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      onModelChangeOverride,
      hideModeSelector = false,
      disableMentions = false,
-      initialContexts,
    },
    ref
  ) => {
+    // Refs and external hooks
    const { data: session } = useSession()
    const params = useParams()
    const workspaceId = params.workspaceId as string
@@ -139,16 +118,18 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      selectedModelOverride !== undefined ? selectedModelOverride : copilotStore.selectedModel
    const setSelectedModel = onModelChangeOverride || copilotStore.setSelectedModel

+    // Internal state
    const [internalMessage, setInternalMessage] = useState('')
    const [isNearTop, setIsNearTop] = useState(false)
    const [containerRef, setContainerRef] = useState<HTMLDivElement | null>(null)
    const [inputContainerRef, setInputContainerRef] = useState<HTMLDivElement | null>(null)
-    const [showSlashMenu, setShowSlashMenu] = useState(false)

+    // Controlled vs uncontrolled message state
    const message = controlledValue !== undefined ? controlledValue : internalMessage
    const setMessage =
      controlledValue !== undefined ? onControlledChange || (() => {}) : setInternalMessage

+    // Effective placeholder
    const effectivePlaceholder =
      placeholder ||
      (mode === 'ask'
@@ -157,8 +138,11 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
          ? 'Plan your workflow'
          : 'Plan, search, build anything')

-    const contextManagement = useContextManagement({ message, initialContexts })
+    // Custom hooks - order matters for ref sharing
+    // Context management (manages selectedContexts state)
+    const contextManagement = useContextManagement({ message })

+    // Mention menu
    const mentionMenu = useMentionMenu({
      message,
      selectedContexts: contextManagement.selectedContexts,
@@ -166,6 +150,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      onMessageChange: setMessage,
    })

+    // Mention token utilities
    const mentionTokensWithContext = useMentionTokens({
      message,
      selectedContexts: contextManagement.selectedContexts,
@@ -193,6 +178,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      isLoading,
    })

+    // Insert mention handlers
    const insertHandlers = useMentionInsertHandlers({
      mentionMenu,
      workflowId: workflowId || null,
@@ -200,12 +186,14 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      onContextAdd: contextManagement.addContext,
    })

+    // Keyboard navigation hook
    const mentionKeyboard = useMentionKeyboard({
      mentionMenu,
      mentionData,
      insertHandlers,
    })

+    // Expose focus method to parent
    useImperativeHandle(
      ref,
      () => ({
@@ -222,6 +210,9 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      [mentionMenu.textareaRef]
    )

+    // Note: textarea auto-resize is handled by the useTextareaAutoResize hook
+
+    // Load workflows on mount if we have a workflowId
    useEffect(() => {
      if (workflowId) {
        void mentionData.ensureWorkflowsLoaded()
@@ -229,6 +220,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      // eslint-disable-next-line react-hooks/exhaustive-deps
    }, [workflowId])

+    // Detect if input is near top of screen
    useEffect(() => {
      const checkPosition = () => {
        if (containerRef) {
@@ -256,6 +248,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      }
    }, [containerRef])

+    // Also check position when mention menu opens
    useEffect(() => {
      if (mentionMenu.showMentionMenu && containerRef) {
        const rect = containerRef.getBoundingClientRect()
@@ -263,6 +256,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      }
    }, [mentionMenu.showMentionMenu, containerRef])

+    // Preload mention data when query is active
    useEffect(() => {
      if (!mentionMenu.showMentionMenu || mentionMenu.openSubmenuFor) {
        return
@@ -274,6 +268,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
        .toLowerCase()

      if (q && q.length > 0) {
+        // Prefetch all lists when there's any query for instant filtering
        void mentionData.ensurePastChatsLoaded()
        void mentionData.ensureWorkflowsLoaded()
        void mentionData.ensureWorkflowBlocksLoaded()
@@ -282,12 +277,15 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
        void mentionData.ensureTemplatesLoaded()
        void mentionData.ensureLogsLoaded()

+        // Reset to first item when query changes
        mentionMenu.setSubmenuActiveIndex(0)
        requestAnimationFrame(() => mentionMenu.scrollActiveItemIntoView(0))
      }
+      // Only depend on values that trigger data loading, not the entire objects
      // eslint-disable-next-line react-hooks/exhaustive-deps
    }, [mentionMenu.showMentionMenu, mentionMenu.openSubmenuFor, message])

+    // When switching into a submenu, select the first item and scroll to it
    useEffect(() => {
      if (mentionMenu.openSubmenuFor) {
        mentionMenu.setSubmenuActiveIndex(0)
@@ -296,10 +294,12 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      // eslint-disable-next-line react-hooks/exhaustive-deps
    }, [mentionMenu.openSubmenuFor])

+    // Handlers
    const handleSubmit = useCallback(
      async (overrideMessage?: string, options: { preserveInput?: boolean } = {}) => {
        const targetMessage = overrideMessage ?? message
        const trimmedMessage = targetMessage.trim()
+        // Allow submission even when isLoading - store will queue the message
        if (!trimmedMessage || disabled) return

        const failedUploads = fileAttachments.attachedFiles.filter((f) => !f.uploading && !f.key)
@@ -370,124 +370,28 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      }
    }, [onAbort, isLoading])

-    const handleSlashCommandSelect = useCallback(
-      (command: string) => {
-        const displayLabel =
-          COMMAND_DISPLAY_LABELS[command] || command.charAt(0).toUpperCase() + command.slice(1)
-        mentionMenu.replaceActiveSlashWith(displayLabel)
-        contextManagement.addContext({
-          kind: 'slash_command',
-          command,
-          label: displayLabel,
-        })
-
-        setShowSlashMenu(false)
-        mentionMenu.textareaRef.current?.focus()
-      },
-      [mentionMenu, contextManagement]
-    )
-
    const handleKeyDown = useCallback(
      (e: KeyboardEvent<HTMLTextAreaElement>) => {
-        if (e.key === 'Escape' && (mentionMenu.showMentionMenu || showSlashMenu)) {
+        // Escape key handling
+        if (e.key === 'Escape' && mentionMenu.showMentionMenu) {
          e.preventDefault()
          if (mentionMenu.openSubmenuFor) {
            mentionMenu.setOpenSubmenuFor(null)
            mentionMenu.setSubmenuQueryStart(null)
          } else {
            mentionMenu.closeMentionMenu()
-            setShowSlashMenu(false)
          }
          return
        }

-        if (showSlashMenu) {
-          const caretPos = mentionMenu.getCaretPos()
-          const activeSlash = mentionMenu.getActiveSlashQueryAtPosition(caretPos, message)
-          const query = activeSlash?.query.trim().toLowerCase() || ''
-          const showAggregatedView = query.length > 0
-          const direction = e.key === 'ArrowDown' ? 'down' : 'up'
-
-          if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
-            e.preventDefault()
-
-            if (mentionMenu.openSubmenuFor === 'Web') {
-              mentionMenu.setSubmenuActiveIndex((prev) => {
-                const next = getNextIndex(prev, direction, WEB_COMMANDS.length - 1)
-                requestAnimationFrame(() => mentionMenu.scrollActiveItemIntoView(next))
-                return next
-              })
-            } else if (showAggregatedView) {
-              const filtered = ALL_COMMANDS.filter((cmd) => cmd.includes(query))
-              mentionMenu.setSubmenuActiveIndex((prev) => {
-                if (filtered.length === 0) return 0
-                const next = getNextIndex(prev, direction, filtered.length - 1)
-                requestAnimationFrame(() => mentionMenu.scrollActiveItemIntoView(next))
-                return next
-              })
-            } else {
-              mentionMenu.setMentionActiveIndex((prev) => {
-                const next = getNextIndex(prev, direction, TOP_LEVEL_COMMANDS.length)
-                requestAnimationFrame(() => mentionMenu.scrollActiveItemIntoView(next))
-                return next
-              })
-            }
-            return
-          }
-
-          if (e.key === 'ArrowRight') {
-            e.preventDefault()
-            if (!showAggregatedView && !mentionMenu.openSubmenuFor) {
-              if (mentionMenu.mentionActiveIndex === TOP_LEVEL_COMMANDS.length) {
-                mentionMenu.setOpenSubmenuFor('Web')
-                mentionMenu.setSubmenuActiveIndex(0)
-              }
-            }
-            return
-          }
-
-          if (e.key === 'ArrowLeft') {
-            e.preventDefault()
-            if (mentionMenu.openSubmenuFor) {
-              mentionMenu.setOpenSubmenuFor(null)
-            }
-            return
-          }
-        }
-
+        // Arrow navigation in mention menu
        if (mentionKeyboard.handleArrowNavigation(e)) return
        if (mentionKeyboard.handleArrowRight(e)) return
        if (mentionKeyboard.handleArrowLeft(e)) return

+        // Enter key handling
        if (e.key === 'Enter' && !e.shiftKey && !e.nativeEvent.isComposing) {
          e.preventDefault()
-          if (showSlashMenu) {
-            const caretPos = mentionMenu.getCaretPos()
-            const activeSlash = mentionMenu.getActiveSlashQueryAtPosition(caretPos, message)
-            const query = activeSlash?.query.trim().toLowerCase() || ''
-            const showAggregatedView = query.length > 0
-
-            if (mentionMenu.openSubmenuFor === 'Web') {
-              const selectedCommand =
-                WEB_COMMANDS[mentionMenu.submenuActiveIndex] || WEB_COMMANDS[0]
-              handleSlashCommandSelect(selectedCommand)
-            } else if (showAggregatedView) {
-              const filtered = ALL_COMMANDS.filter((cmd) => cmd.includes(query))
-              if (filtered.length > 0) {
-                const selectedCommand = filtered[mentionMenu.submenuActiveIndex] || filtered[0]
-                handleSlashCommandSelect(selectedCommand)
-              }
-            } else {
-              const selectedIndex = mentionMenu.mentionActiveIndex
-              if (selectedIndex < TOP_LEVEL_COMMANDS.length) {
-                handleSlashCommandSelect(TOP_LEVEL_COMMANDS[selectedIndex])
-              } else if (selectedIndex === TOP_LEVEL_COMMANDS.length) {
-                mentionMenu.setOpenSubmenuFor('Web')
-                mentionMenu.setSubmenuActiveIndex(0)
-              }
-            }
-            return
-          }
          if (!mentionMenu.showMentionMenu) {
            handleSubmit()
          } else {
@@ -496,6 +400,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
          return
        }

+        // Handle mention token behavior (backspace, delete, arrow keys) when menu is closed
        if (!mentionMenu.showMentionMenu) {
          const textarea = mentionMenu.textareaRef.current
          const selStart = textarea?.selectionStart ?? 0
@@ -504,8 +409,11 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(

          if (e.key === 'Backspace' || e.key === 'Delete') {
            if (selectionLength > 0) {
+              // Multi-character selection: Clean up contexts for any overlapping mentions
+              // but let the default behavior handle the actual text deletion
              mentionTokensWithContext.removeContextsInSelection(selStart, selEnd)
            } else {
+              // Single character delete - check if cursor is inside/at a mention token
              const ranges = mentionTokensWithContext.computeMentionRanges()
              const target =
                e.key === 'Backspace'
@@ -544,6 +452,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
            }
          }

+          // Prevent typing inside token
          if (e.key.length === 1 || e.key === 'Space') {
            const blocked =
              selectionLength === 0 && !!mentionTokensWithContext.findRangeContaining(selStart)
@@ -560,15 +469,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
          }
        }
      },
-      [
-        mentionMenu,
-        mentionKeyboard,
-        handleSubmit,
-        handleSlashCommandSelect,
-        message,
-        mentionTokensWithContext,
-        showSlashMenu,
-      ]
+      [mentionMenu, mentionKeyboard, handleSubmit, message.length, mentionTokensWithContext]
    )

    const handleInputChange = useCallback(
@@ -576,14 +477,13 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
        const newValue = e.target.value
        setMessage(newValue)

+        // Skip mention menu logic if mentions are disabled
        if (disableMentions) return

        const caret = e.target.selectionStart ?? newValue.length
-        const activeMention = mentionMenu.getActiveMentionQueryAtPosition(caret, newValue)
-        const activeSlash = mentionMenu.getActiveSlashQueryAtPosition(caret, newValue)
+        const active = mentionMenu.getActiveMentionQueryAtPosition(caret, newValue)

-        if (activeMention) {
-          setShowSlashMenu(false)
+        if (active) {
          mentionMenu.setShowMentionMenu(true)
          mentionMenu.setInAggregated(false)
          if (mentionMenu.openSubmenuFor) {
@@ -592,17 +492,10 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
            mentionMenu.setMentionActiveIndex(0)
            mentionMenu.setSubmenuActiveIndex(0)
          }
-        } else if (activeSlash) {
-          mentionMenu.setShowMentionMenu(false)
-          mentionMenu.setOpenSubmenuFor(null)
-          mentionMenu.setSubmenuQueryStart(null)
-          setShowSlashMenu(true)
-          mentionMenu.setSubmenuActiveIndex(0)
        } else {
          mentionMenu.setShowMentionMenu(false)
          mentionMenu.setOpenSubmenuFor(null)
          mentionMenu.setSubmenuQueryStart(null)
-          setShowSlashMenu(false)
        }
      },
      [setMessage, mentionMenu, disableMentions]
@@ -621,66 +514,58 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      }
    }, [mentionMenu.textareaRef, mentionTokensWithContext])

-    const insertTriggerAndOpenMenu = useCallback(
-      (trigger: '@' | '/') => {
-        if (disabled || isLoading) return
-        const textarea = mentionMenu.textareaRef.current
-        if (!textarea) return
+    const handleOpenMentionMenuWithAt = useCallback(() => {
+      if (disabled || isLoading) return
+      const textarea = mentionMenu.textareaRef.current
+      if (!textarea) return
+      textarea.focus()
+      const pos = textarea.selectionStart ?? message.length
+      const needsSpaceBefore = pos > 0 && !/\s/.test(message.charAt(pos - 1))

+      const insertText = needsSpaceBefore ? ' @' : '@'
+      const start = textarea.selectionStart ?? message.length
+      const end = textarea.selectionEnd ?? message.length
+      const before = message.slice(0, start)
+      const after = message.slice(end)
+      const next = `${before}${insertText}${after}`
+      setMessage(next)
+
+      setTimeout(() => {
+        const newPos = before.length + insertText.length
+        textarea.setSelectionRange(newPos, newPos)
        textarea.focus()
-        const start = textarea.selectionStart ?? message.length
-        const end = textarea.selectionEnd ?? message.length
-        const needsSpaceBefore = start > 0 && !/\s/.test(message.charAt(start - 1))
+      }, 0)

-        const insertText = needsSpaceBefore ? ` ${trigger}` : trigger
-        const before = message.slice(0, start)
-        const after = message.slice(end)
-        setMessage(`${before}${insertText}${after}`)
-
-        setTimeout(() => {
-          const newPos = before.length + insertText.length
-          textarea.setSelectionRange(newPos, newPos)
-          textarea.focus()
-        }, 0)
-
-        if (trigger === '@') {
-          mentionMenu.setShowMentionMenu(true)
-          mentionMenu.setOpenSubmenuFor(null)
-          mentionMenu.setMentionActiveIndex(0)
-        } else {
-          setShowSlashMenu(true)
-        }
-        mentionMenu.setSubmenuActiveIndex(0)
-      },
-      [disabled, isLoading, mentionMenu, message, setMessage]
-    )
-
-    const handleOpenMentionMenuWithAt = useCallback(
-      () => insertTriggerAndOpenMenu('@'),
-      [insertTriggerAndOpenMenu]
-    )
-
-    const handleOpenSlashMenu = useCallback(
-      () => insertTriggerAndOpenMenu('/'),
-      [insertTriggerAndOpenMenu]
-    )
+      mentionMenu.setShowMentionMenu(true)
+      mentionMenu.setOpenSubmenuFor(null)
+      mentionMenu.setMentionActiveIndex(0)
+      mentionMenu.setSubmenuActiveIndex(0)
+    }, [disabled, isLoading, mentionMenu, message, setMessage])

    const canSubmit = message.trim().length > 0 && !disabled && !isLoading
    const showAbortButton = isLoading && onAbort

+    // Render overlay content with highlighted mentions
    const renderOverlayContent = useCallback(() => {
      const contexts = contextManagement.selectedContexts

+      // Handle empty message
      if (!message) {
        return <span>{'\u00A0'}</span>
      }

+      // If no contexts, render the message directly with proper newline handling
      if (contexts.length === 0) {
+        // Add a zero-width space at the end if message ends with newline
+        // This ensures the newline is rendered and height is calculated correctly
        const displayText = message.endsWith('\n') ? `${message}\u200B` : message
        return <span>{displayText}</span>
      }

      const elements: React.ReactNode[] = []
+      const labels = contexts.map((c) => c.label).filter(Boolean)
+
+      // Build ranges for all mentions to highlight them including spaces
      const ranges = mentionTokensWithContext.computeMentionRanges()

      if (ranges.length === 0) {
@@ -692,11 +577,14 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      for (let i = 0; i < ranges.length; i++) {
        const range = ranges[i]

+        // Add text before mention
        if (range.start > lastIndex) {
          const before = message.slice(lastIndex, range.start)
          elements.push(<span key={`text-${i}-${lastIndex}-${range.start}`}>{before}</span>)
        }

+        // Add highlighted mention (including spaces)
+        // Use index + start + end to ensure unique keys even with duplicate contexts
        const mentionText = message.slice(range.start, range.end)
        elements.push(
          <span
@@ -711,10 +599,12 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(

      const tail = message.slice(lastIndex)
      if (tail) {
+        // Add a zero-width space at the end if tail ends with newline
        const displayTail = tail.endsWith('\n') ? `${tail}\u200B` : tail
        elements.push(<span key={`tail-${lastIndex}`}>{displayTail}</span>)
      }

+      // Ensure there's always something to render for height calculation
      return elements.length > 0 ? elements : <span>{'\u00A0'}</span>
    }, [message, contextManagement.selectedContexts, mentionTokensWithContext])

@@ -753,20 +643,6 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
                    <AtSign className='h-3 w-3' strokeWidth={1.75} />
                  </Badge>

-                  <Badge
-                    variant='outline'
-                    onClick={handleOpenSlashMenu}
-                    title='Insert /'
-                    className={cn(
-                      'cursor-pointer rounded-[6px] p-[4.5px]',
-                      (disabled || isLoading) && 'cursor-not-allowed'
-                    )}
-                  >
-                    <span className='flex h-3 w-3 items-center justify-center font-medium text-[11px] leading-none'>
-                      /
-                    </span>
-                  </Badge>
-
                  {/* Selected Context Pills */}
                  <ContextPills
                    contexts={contextManagement.selectedContexts}
@@ -841,18 +717,6 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
                />,
                document.body
              )}
-
-            {/* Slash Menu Portal */}
-            {!disableMentions &&
-              showSlashMenu &&
-              createPortal(
-                <SlashMenu
-                  mentionMenu={mentionMenu}
-                  message={message}
-                  onSelectCommand={handleSlashCommandSelect}
-                />,
-                document.body
-              )}
          </div>

          {/* Bottom Row: Mode Selector + Model Selector + Attach Button + Send Button */}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -356,9 +356,6 @@ const WorkflowContent = React.memo(() => {
  /** Stores source node/handle info when a connection drag starts for drop-on-block detection. */
  const connectionSourceRef = useRef<{ nodeId: string; handleId: string } | null>(null)

-  /** Tracks whether onConnect successfully handled the connection (ReactFlow pattern). */
-  const connectionCompletedRef = useRef(false)
-
  /** Stores start positions for multi-node drag undo/redo recording. */
  const multiNodeDragStartRef = useRef<Map<string, { x: number; y: number; parentId?: string }>>(
    new Map()
@@ -2217,8 +2214,7 @@ const WorkflowContent = React.memo(() => {
  )

  /**
-   * Captures the source handle when a connection drag starts.
-   * Resets connectionCompletedRef to track if onConnect handles this connection.
+   * Captures the source handle when a connection drag starts
   */
  const onConnectStart = useCallback((_event: any, params: any) => {
    const handleId: string | undefined = params?.handleId
@@ -2227,7 +2223,6 @@ const WorkflowContent = React.memo(() => {
      nodeId: params?.nodeId,
      handleId: params?.handleId,
    }
-    connectionCompletedRef.current = false
  }, [])

  /** Handles new edge connections with container boundary validation. */
@@ -2288,7 +2283,6 @@ const WorkflowContent = React.memo(() => {
              isInsideContainer: true,
            },
          })
-          connectionCompletedRef.current = true
          return
        }

@@ -2317,7 +2311,6 @@ const WorkflowContent = React.memo(() => {
              }
            : undefined,
        })
-        connectionCompletedRef.current = true
      }
    },
    [addEdge, getNodes, blocks]
@@ -2326,9 +2319,8 @@ const WorkflowContent = React.memo(() => {
  /**
   * Handles connection drag end. Detects if the edge was dropped over a block
   * and automatically creates a connection to that block's target handle.
-   *
-   * Uses connectionCompletedRef to check if onConnect already handled this connection
-   * (ReactFlow pattern for distinguishing handle-to-handle vs handle-to-body drops).
+   * Only creates a connection if ReactFlow didn't already handle it (e.g., when
+   * dropping on the block body instead of a handle).
   */
  const onConnectEnd = useCallback(
    (event: MouseEvent | TouchEvent) => {
@@ -2340,12 +2332,6 @@ const WorkflowContent = React.memo(() => {
        return
      }

-      // If onConnect already handled this connection, skip (handle-to-handle case)
-      if (connectionCompletedRef.current) {
-        connectionSourceRef.current = null
-        return
-      }
-
      // Get cursor position in flow coordinates
      const clientPos = 'changedTouches' in event ? event.changedTouches[0] : event
      const flowPosition = screenToFlowPosition({
@@ -2356,14 +2342,25 @@ const WorkflowContent = React.memo(() => {
      // Find node under cursor
      const targetNode = findNodeAtPosition(flowPosition)

-      // Create connection if valid target found (handle-to-body case)
+      // Create connection if valid target found AND edge doesn't already exist
+      // ReactFlow's onConnect fires first when dropping on a handle, so we check
+      // if that connection already exists to avoid creating duplicates.
+      // IMPORTANT: We must read directly from the store (not React state) because
+      // the store update from ReactFlow's onConnect may not have triggered a
+      // React re-render yet when this callback runs (typically 1-2ms later).
      if (targetNode && targetNode.id !== source.nodeId) {
-        onConnect({
-          source: source.nodeId,
-          sourceHandle: source.handleId,
-          target: targetNode.id,
-          targetHandle: 'target',
-        })
+        const currentEdges = useWorkflowStore.getState().edges
+        const edgeAlreadyExists = currentEdges.some(
+          (e) => e.source === source.nodeId && e.target === targetNode.id
+        )
+        if (!edgeAlreadyExists) {
+          onConnect({
+            source: source.nodeId,
+            sourceHandle: source.handleId,
+            target: targetNode.id,
+            targetHandle: 'target',
+          })
+        }
      }

      connectionSourceRef.current = null
--- a/apps/sim/blocks/blocks/schedule.ts
+++ b/apps/sim/blocks/blocks/schedule.ts
@@ -172,7 +172,7 @@ export const ScheduleBlock: BlockConfig = {
        { label: 'Melbourne (UTC+10)', id: 'Australia/Melbourne' },
        { label: 'Auckland (UTC+12)', id: 'Pacific/Auckland' },
      ],
-      value: () => Intl.DateTimeFormat().resolvedOptions().timeZone,
+      value: () => 'UTC',
      required: false,
      mode: 'trigger',
      condition: { field: 'scheduleType', value: ['minutes', 'hourly'], not: true },
--- a/apps/sim/blocks/blocks/slack.ts
+++ b/apps/sim/blocks/blocks/slack.ts
@@ -26,8 +26,6 @@ export const SlackBlock: BlockConfig<SlackResponse> = {
        { label: 'Send Message', id: 'send' },
        { label: 'Create Canvas', id: 'canvas' },
        { label: 'Read Messages', id: 'read' },
-        { label: 'Get Message', id: 'get_message' },
-        { label: 'Get Thread', id: 'get_thread' },
        { label: 'List Channels', id: 'list_channels' },
        { label: 'List Channel Members', id: 'list_members' },
        { label: 'List Users', id: 'list_users' },
@@ -318,68 +316,6 @@ export const SlackBlock: BlockConfig<SlackResponse> = {
      },
      required: true,
    },
-    // Get Message specific fields
-    {
-      id: 'getMessageTimestamp',
-      title: 'Message Timestamp',
-      type: 'short-input',
-      placeholder: 'Message timestamp (e.g., 1405894322.002768)',
-      condition: {
-        field: 'operation',
-        value: 'get_message',
-      },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        prompt: `Extract or generate a Slack message timestamp from the user's input.
-Slack message timestamps are in the format: XXXXXXXXXX.XXXXXX (seconds.microseconds since Unix epoch).
-Examples:
- "1405894322.002768" -> 1405894322.002768 (already a valid timestamp)
- "thread_ts from the trigger" -> The user wants to reference a variable, output the original text
- A URL like "https://slack.com/archives/C123/p1405894322002768" -> Extract 1405894322.002768 (remove 'p' prefix, add decimal after 10th digit)
-
-If the input looks like a reference to another block's output (contains < and >) or a variable, return it as-is.
-Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
-        placeholder: 'Paste a Slack message URL or timestamp...',
-        generationType: 'timestamp',
-      },
-    },
-    // Get Thread specific fields
-    {
-      id: 'getThreadTimestamp',
-      title: 'Thread Timestamp',
-      type: 'short-input',
-      placeholder: 'Thread timestamp (thread_ts, e.g., 1405894322.002768)',
-      condition: {
-        field: 'operation',
-        value: 'get_thread',
-      },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        prompt: `Extract or generate a Slack thread timestamp from the user's input.
-Slack thread timestamps (thread_ts) are in the format: XXXXXXXXXX.XXXXXX (seconds.microseconds since Unix epoch).
-Examples:
- "1405894322.002768" -> 1405894322.002768 (already a valid timestamp)
- "thread_ts from the trigger" -> The user wants to reference a variable, output the original text
- A URL like "https://slack.com/archives/C123/p1405894322002768" -> Extract 1405894322.002768 (remove 'p' prefix, add decimal after 10th digit)
-
-If the input looks like a reference to another block's output (contains < and >) or a variable, return it as-is.
-Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
-        placeholder: 'Paste a Slack thread URL or thread_ts...',
-        generationType: 'timestamp',
-      },
-    },
-    {
-      id: 'threadLimit',
-      title: 'Message Limit',
-      type: 'short-input',
-      placeholder: '100',
-      condition: {
-        field: 'operation',
-        value: 'get_thread',
-      },
-    },
    {
      id: 'oldest',
      title: 'Oldest Timestamp',
@@ -494,8 +430,6 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
      'slack_message',
      'slack_canvas',
      'slack_message_reader',
-      'slack_get_message',
-      'slack_get_thread',
      'slack_list_channels',
      'slack_list_members',
      'slack_list_users',
@@ -514,10 +448,6 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
            return 'slack_canvas'
          case 'read':
            return 'slack_message_reader'
-          case 'get_message':
-            return 'slack_get_message'
-          case 'get_thread':
-            return 'slack_get_thread'
          case 'list_channels':
            return 'slack_list_channels'
          case 'list_members':
@@ -568,9 +498,6 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
          includeDeleted,
          userLimit,
          userId,
-          getMessageTimestamp,
-          getThreadTimestamp,
-          threadLimit,
          ...rest
        } = params

@@ -647,27 +574,6 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
            break
          }

-          case 'get_message':
-            if (!getMessageTimestamp) {
-              throw new Error('Message timestamp is required for get message operation')
-            }
-            baseParams.timestamp = getMessageTimestamp
-            break
-
-          case 'get_thread': {
-            if (!getThreadTimestamp) {
-              throw new Error('Thread timestamp is required for get thread operation')
-            }
-            baseParams.threadTs = getThreadTimestamp
-            if (threadLimit) {
-              const parsedLimit = Number.parseInt(threadLimit, 10)
-              if (!Number.isNaN(parsedLimit) && parsedLimit > 0) {
-                baseParams.limit = Math.min(parsedLimit, 200)
-              }
-            }
-            break
-          }
-
          case 'list_channels': {
            baseParams.includePrivate = includePrivate !== 'false'
            baseParams.excludeArchived = true
@@ -773,14 +679,6 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
    userLimit: { type: 'string', description: 'Maximum number of users to return' },
    // Get User inputs
    userId: { type: 'string', description: 'User ID to look up' },
-    // Get Message inputs
-    getMessageTimestamp: { type: 'string', description: 'Message timestamp to retrieve' },
-    // Get Thread inputs
-    getThreadTimestamp: { type: 'string', description: 'Thread timestamp to retrieve' },
-    threadLimit: {
-      type: 'string',
-      description: 'Maximum number of messages to return from thread',
-    },
  },
  outputs: {
    // slack_message outputs (send operation)
@@ -808,24 +706,6 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
        'Array of message objects with comprehensive properties: text, user, timestamp, reactions, threads, files, attachments, blocks, stars, pins, and edit history',
    },

-    // slack_get_thread outputs (get_thread operation)
-    parentMessage: {
-      type: 'json',
-      description: 'The thread parent message with all properties',
-    },
-    replies: {
-      type: 'json',
-      description: 'Array of reply messages in the thread (excluding the parent)',
-    },
-    replyCount: {
-      type: 'number',
-      description: 'Number of replies returned in this response',
-    },
-    hasMore: {
-      type: 'boolean',
-      description: 'Whether there are more messages in the thread',
-    },
-
    // slack_list_channels outputs (list_channels operation)
    channels: {
      type: 'json',
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -313,26 +313,6 @@ export const getBlock = (type: string): BlockConfig | undefined => {
  return registry[normalized]
 }

-export const getLatestBlock = (baseType: string): BlockConfig | undefined => {
-  const normalized = baseType.replace(/-/g, '_')
-
-  const versionedKeys = Object.keys(registry).filter((key) => {
-    const match = key.match(new RegExp(`^${normalized}_v(\\d+)$`))
-    return match !== null
-  })
-
-  if (versionedKeys.length > 0) {
-    const sorted = versionedKeys.sort((a, b) => {
-      const versionA = Number.parseInt(a.match(/_v(\d+)$/)?.[1] || '0', 10)
-      const versionB = Number.parseInt(b.match(/_v(\d+)$/)?.[1] || '0', 10)
-      return versionB - versionA
-    })
-    return registry[sorted[0]]
-  }
-
-  return registry[normalized]
-}
-
 export const getBlockByToolName = (toolName: string): BlockConfig | undefined => {
  return Object.values(registry).find((block) => block.tools?.access?.includes(toolName))
 }
--- a/apps/sim/executor/utils/start-block.ts
+++ b/apps/sim/executor/utils/start-block.ts
@@ -378,10 +378,21 @@ function buildManualTriggerOutput(
 }

 function buildIntegrationTriggerOutput(
-  _finalInput: unknown,
+  finalInput: unknown,
  workflowInput: unknown
 ): NormalizedBlockOutput {
-  return isPlainObject(workflowInput) ? (workflowInput as NormalizedBlockOutput) : {}
+  const base: NormalizedBlockOutput = isPlainObject(workflowInput)
+    ? ({ ...(workflowInput as Record<string, unknown>) } as NormalizedBlockOutput)
+    : {}
+
+  if (isPlainObject(finalInput)) {
+    Object.assign(base, finalInput as Record<string, unknown>)
+    base.input = { ...(finalInput as Record<string, unknown>) }
+  } else {
+    base.input = finalInput
+  }
+
+  return mergeFilesIntoOutput(base, workflowInput)
 }

 function extractSubBlocks(block: SerializedBlock): Record<string, unknown> | undefined {
--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -22,7 +22,7 @@ import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { filterNewEdges, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
+import { mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState, Loop, Parallel, Position } from '@/stores/workflows/workflow/types'

@@ -242,10 +242,7 @@ export function useCollaborativeWorkflow() {
            case EDGES_OPERATIONS.BATCH_ADD_EDGES: {
              const { edges } = payload
              if (Array.isArray(edges) && edges.length > 0) {
-                const newEdges = filterNewEdges(edges, workflowStore.edges)
-                if (newEdges.length > 0) {
-                  workflowStore.batchAddEdges(newEdges)
-                }
+                workflowStore.batchAddEdges(edges)
              }
              break
            }
@@ -979,9 +976,6 @@ export function useCollaborativeWorkflow() {

      if (edges.length === 0) return false

-      const newEdges = filterNewEdges(edges, workflowStore.edges)
-      if (newEdges.length === 0) return false
-
      const operationId = crypto.randomUUID()

      addToQueue({
@@ -989,16 +983,16 @@ export function useCollaborativeWorkflow() {
        operation: {
          operation: EDGES_OPERATIONS.BATCH_ADD_EDGES,
          target: OPERATION_TARGETS.EDGES,
-          payload: { edges: newEdges },
+          payload: { edges },
        },
        workflowId: activeWorkflowId || '',
        userId: session?.user?.id || 'unknown',
      })

-      workflowStore.batchAddEdges(newEdges)
+      workflowStore.batchAddEdges(edges)

      if (!options?.skipUndoRedo) {
-        newEdges.forEach((edge) => undoRedo.recordAddEdge(edge.id))
+        edges.forEach((edge) => undoRedo.recordAddEdge(edge.id))
      }

      return true
--- a/apps/sim/lib/copilot/api.ts
+++ b/apps/sim/lib/copilot/api.ts
@@ -99,7 +99,6 @@ export interface SendMessageRequest {
    workflowId?: string
    executionId?: string
  }>
-  commands?: string[]
 }

 /**
--- a/apps/sim/lib/copilot/tools/client/blocks/get-block-config.ts
+++ b/apps/sim/lib/copilot/tools/client/blocks/get-block-config.ts
@@ -10,7 +10,6 @@ import {
  GetBlockConfigInput,
  GetBlockConfigResult,
 } from '@/lib/copilot/tools/shared/schemas'
-import { getBlock } from '@/blocks/registry'

 interface GetBlockConfigArgs {
  blockType: string
@@ -40,9 +39,7 @@ export class GetBlockConfigClientTool extends BaseClientTool {
    },
    getDynamicText: (params, state) => {
      if (params?.blockType && typeof params.blockType === 'string') {
-        // Look up the block config to get the human-readable name
-        const blockConfig = getBlock(params.blockType)
-        const blockName = (blockConfig?.name ?? params.blockType.replace(/_/g, ' ')).toLowerCase()
+        const blockName = params.blockType.replace(/_/g, ' ')
        const opSuffix = params.operation ? ` (${params.operation})` : ''

        switch (state) {
--- a/apps/sim/lib/copilot/tools/client/blocks/get-block-options.ts
+++ b/apps/sim/lib/copilot/tools/client/blocks/get-block-options.ts
@@ -10,7 +10,6 @@ import {
  GetBlockOptionsInput,
  GetBlockOptionsResult,
 } from '@/lib/copilot/tools/shared/schemas'
-import { getBlock } from '@/blocks/registry'

 interface GetBlockOptionsArgs {
  blockId: string
@@ -38,9 +37,7 @@ export class GetBlockOptionsClientTool extends BaseClientTool {
    },
    getDynamicText: (params, state) => {
      if (params?.blockId && typeof params.blockId === 'string') {
-        // Look up the block config to get the human-readable name
-        const blockConfig = getBlock(params.blockId)
-        const blockName = (blockConfig?.name ?? params.blockId.replace(/_/g, ' ')).toLowerCase()
+        const blockName = params.blockId.replace(/_/g, ' ')

        switch (state) {
          case ClientToolCallState.success:
--- a/apps/sim/lib/copilot/tools/client/init-tool-configs.ts
+++ b/apps/sim/lib/copilot/tools/client/init-tool-configs.ts
@@ -18,7 +18,6 @@ import './other/make-api-request'
 import './other/plan'
 import './other/research'
 import './other/sleep'
-import './other/superagent'
 import './other/test'
 import './other/tour'
 import './other/workflow'
--- a/apps/sim/lib/copilot/tools/client/other/crawl-website.ts
+++ b/apps/sim/lib/copilot/tools/client/other/crawl-website.ts
@@ -1,53 +0,0 @@
-import { Globe, Loader2, MinusCircle, XCircle } from 'lucide-react'
-import {
-  BaseClientTool,
-  type BaseClientToolMetadata,
-  ClientToolCallState,
-} from '@/lib/copilot/tools/client/base-tool'
-
-export class CrawlWebsiteClientTool extends BaseClientTool {
-  static readonly id = 'crawl_website'
-
-  constructor(toolCallId: string) {
-    super(toolCallId, CrawlWebsiteClientTool.id, CrawlWebsiteClientTool.metadata)
-  }
-
-  static readonly metadata: BaseClientToolMetadata = {
-    displayNames: {
-      [ClientToolCallState.generating]: { text: 'Crawling website', icon: Loader2 },
-      [ClientToolCallState.pending]: { text: 'Crawling website', icon: Loader2 },
-      [ClientToolCallState.executing]: { text: 'Crawling website', icon: Loader2 },
-      [ClientToolCallState.success]: { text: 'Crawled website', icon: Globe },
-      [ClientToolCallState.error]: { text: 'Failed to crawl website', icon: XCircle },
-      [ClientToolCallState.aborted]: { text: 'Aborted crawling website', icon: MinusCircle },
-      [ClientToolCallState.rejected]: { text: 'Skipped crawling website', icon: MinusCircle },
-    },
-    interrupt: undefined,
-    getDynamicText: (params, state) => {
-      if (params?.url && typeof params.url === 'string') {
-        const url = params.url
-        const truncated = url.length > 50 ? `${url.slice(0, 50)}...` : url
-
-        switch (state) {
-          case ClientToolCallState.success:
-            return `Crawled ${truncated}`
-          case ClientToolCallState.executing:
-          case ClientToolCallState.generating:
-          case ClientToolCallState.pending:
-            return `Crawling ${truncated}`
-          case ClientToolCallState.error:
-            return `Failed to crawl ${truncated}`
-          case ClientToolCallState.aborted:
-            return `Aborted crawling ${truncated}`
-          case ClientToolCallState.rejected:
-            return `Skipped crawling ${truncated}`
-        }
-      }
-      return undefined
-    },
-  }
-
-  async execute(): Promise<void> {
-    return
-  }
-}
--- a/apps/sim/lib/copilot/tools/client/other/get-page-contents.ts
+++ b/apps/sim/lib/copilot/tools/client/other/get-page-contents.ts
@@ -1,54 +0,0 @@
-import { FileText, Loader2, MinusCircle, XCircle } from 'lucide-react'
-import {
-  BaseClientTool,
-  type BaseClientToolMetadata,
-  ClientToolCallState,
-} from '@/lib/copilot/tools/client/base-tool'
-
-export class GetPageContentsClientTool extends BaseClientTool {
-  static readonly id = 'get_page_contents'
-
-  constructor(toolCallId: string) {
-    super(toolCallId, GetPageContentsClientTool.id, GetPageContentsClientTool.metadata)
-  }
-
-  static readonly metadata: BaseClientToolMetadata = {
-    displayNames: {
-      [ClientToolCallState.generating]: { text: 'Getting page contents', icon: Loader2 },
-      [ClientToolCallState.pending]: { text: 'Getting page contents', icon: Loader2 },
-      [ClientToolCallState.executing]: { text: 'Getting page contents', icon: Loader2 },
-      [ClientToolCallState.success]: { text: 'Retrieved page contents', icon: FileText },
-      [ClientToolCallState.error]: { text: 'Failed to get page contents', icon: XCircle },
-      [ClientToolCallState.aborted]: { text: 'Aborted getting page contents', icon: MinusCircle },
-      [ClientToolCallState.rejected]: { text: 'Skipped getting page contents', icon: MinusCircle },
-    },
-    interrupt: undefined,
-    getDynamicText: (params, state) => {
-      if (params?.urls && Array.isArray(params.urls) && params.urls.length > 0) {
-        const firstUrl = String(params.urls[0])
-        const truncated = firstUrl.length > 40 ? `${firstUrl.slice(0, 40)}...` : firstUrl
-        const count = params.urls.length
-
-        switch (state) {
-          case ClientToolCallState.success:
-            return count > 1 ? `Retrieved ${count} pages` : `Retrieved ${truncated}`
-          case ClientToolCallState.executing:
-          case ClientToolCallState.generating:
-          case ClientToolCallState.pending:
-            return count > 1 ? `Getting ${count} pages` : `Getting ${truncated}`
-          case ClientToolCallState.error:
-            return count > 1 ? `Failed to get ${count} pages` : `Failed to get ${truncated}`
-          case ClientToolCallState.aborted:
-            return count > 1 ? `Aborted getting ${count} pages` : `Aborted getting ${truncated}`
-          case ClientToolCallState.rejected:
-            return count > 1 ? `Skipped getting ${count} pages` : `Skipped getting ${truncated}`
-        }
-      }
-      return undefined
-    },
-  }
-
-  async execute(): Promise<void> {
-    return
-  }
-}
--- a/apps/sim/lib/copilot/tools/client/other/scrape-page.ts
+++ b/apps/sim/lib/copilot/tools/client/other/scrape-page.ts
@@ -1,53 +0,0 @@
-import { Globe, Loader2, MinusCircle, XCircle } from 'lucide-react'
-import {
-  BaseClientTool,
-  type BaseClientToolMetadata,
-  ClientToolCallState,
-} from '@/lib/copilot/tools/client/base-tool'
-
-export class ScrapePageClientTool extends BaseClientTool {
-  static readonly id = 'scrape_page'
-
-  constructor(toolCallId: string) {
-    super(toolCallId, ScrapePageClientTool.id, ScrapePageClientTool.metadata)
-  }
-
-  static readonly metadata: BaseClientToolMetadata = {
-    displayNames: {
-      [ClientToolCallState.generating]: { text: 'Scraping page', icon: Loader2 },
-      [ClientToolCallState.pending]: { text: 'Scraping page', icon: Loader2 },
-      [ClientToolCallState.executing]: { text: 'Scraping page', icon: Loader2 },
-      [ClientToolCallState.success]: { text: 'Scraped page', icon: Globe },
-      [ClientToolCallState.error]: { text: 'Failed to scrape page', icon: XCircle },
-      [ClientToolCallState.aborted]: { text: 'Aborted scraping page', icon: MinusCircle },
-      [ClientToolCallState.rejected]: { text: 'Skipped scraping page', icon: MinusCircle },
-    },
-    interrupt: undefined,
-    getDynamicText: (params, state) => {
-      if (params?.url && typeof params.url === 'string') {
-        const url = params.url
-        const truncated = url.length > 50 ? `${url.slice(0, 50)}...` : url
-
-        switch (state) {
-          case ClientToolCallState.success:
-            return `Scraped ${truncated}`
-          case ClientToolCallState.executing:
-          case ClientToolCallState.generating:
-          case ClientToolCallState.pending:
-            return `Scraping ${truncated}`
-          case ClientToolCallState.error:
-            return `Failed to scrape ${truncated}`
-          case ClientToolCallState.aborted:
-            return `Aborted scraping ${truncated}`
-          case ClientToolCallState.rejected:
-            return `Skipped scraping ${truncated}`
-        }
-      }
-      return undefined
-    },
-  }
-
-  async execute(): Promise<void> {
-    return
-  }
-}
--- a/apps/sim/lib/copilot/tools/client/other/search-online.ts
+++ b/apps/sim/lib/copilot/tools/client/other/search-online.ts
@@ -1,9 +1,19 @@
+import { createLogger } from '@sim/logger'
 import { Globe, Loader2, MinusCircle, XCircle } from 'lucide-react'
 import {
  BaseClientTool,
  type BaseClientToolMetadata,
  ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
+import { ExecuteResponseSuccessSchema } from '@/lib/copilot/tools/shared/schemas'
+
+interface SearchOnlineArgs {
+  query: string
+  num?: number
+  type?: string
+  gl?: string
+  hl?: string
+}

 export class SearchOnlineClientTool extends BaseClientTool {
  static readonly id = 'search_online'
@@ -22,7 +32,6 @@ export class SearchOnlineClientTool extends BaseClientTool {
      [ClientToolCallState.rejected]: { text: 'Skipped online search', icon: MinusCircle },
      [ClientToolCallState.aborted]: { text: 'Aborted online search', icon: XCircle },
    },
-    interrupt: undefined,
    getDynamicText: (params, state) => {
      if (params?.query && typeof params.query === 'string') {
        const query = params.query
@@ -47,7 +56,28 @@ export class SearchOnlineClientTool extends BaseClientTool {
    },
  }

-  async execute(): Promise<void> {
-    return
+  async execute(args?: SearchOnlineArgs): Promise<void> {
+    const logger = createLogger('SearchOnlineClientTool')
+    try {
+      this.setState(ClientToolCallState.executing)
+      const res = await fetch('/api/copilot/execute-copilot-server-tool', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ toolName: 'search_online', payload: args || {} }),
+      })
+      if (!res.ok) {
+        const txt = await res.text().catch(() => '')
+        throw new Error(txt || `Server error (${res.status})`)
+      }
+      const json = await res.json()
+      const parsed = ExecuteResponseSuccessSchema.parse(json)
+      this.setState(ClientToolCallState.success)
+      await this.markToolComplete(200, 'Online search complete', parsed.result)
+      this.setState(ClientToolCallState.success)
+    } catch (e: any) {
+      logger.error('execute failed', { message: e?.message })
+      this.setState(ClientToolCallState.error)
+      await this.markToolComplete(500, e?.message || 'Search failed')
+    }
  }
 }
--- a/apps/sim/lib/copilot/tools/client/other/superagent.ts
+++ b/apps/sim/lib/copilot/tools/client/other/superagent.ts
@@ -1,56 +0,0 @@
-import { Loader2, Sparkles, XCircle } from 'lucide-react'
-import {
-  BaseClientTool,
-  type BaseClientToolMetadata,
-  ClientToolCallState,
-} from '@/lib/copilot/tools/client/base-tool'
-import { registerToolUIConfig } from '@/lib/copilot/tools/client/ui-config'
-
-interface SuperagentArgs {
-  instruction: string
-}
-
-/**
- * Superagent tool that spawns a powerful subagent for complex tasks.
- * This tool auto-executes and the actual work is done by the superagent.
- * The subagent's output is streamed as nested content under this tool call.
- */
-export class SuperagentClientTool extends BaseClientTool {
-  static readonly id = 'superagent'
-
-  constructor(toolCallId: string) {
-    super(toolCallId, SuperagentClientTool.id, SuperagentClientTool.metadata)
-  }
-
-  static readonly metadata: BaseClientToolMetadata = {
-    displayNames: {
-      [ClientToolCallState.generating]: { text: 'Superagent working', icon: Loader2 },
-      [ClientToolCallState.pending]: { text: 'Superagent working', icon: Loader2 },
-      [ClientToolCallState.executing]: { text: 'Superagent working', icon: Loader2 },
-      [ClientToolCallState.success]: { text: 'Superagent completed', icon: Sparkles },
-      [ClientToolCallState.error]: { text: 'Superagent failed', icon: XCircle },
-      [ClientToolCallState.rejected]: { text: 'Superagent skipped', icon: XCircle },
-      [ClientToolCallState.aborted]: { text: 'Superagent aborted', icon: XCircle },
-    },
-    uiConfig: {
-      subagent: {
-        streamingLabel: 'Superagent working',
-        completedLabel: 'Superagent completed',
-        shouldCollapse: true,
-        outputArtifacts: [],
-      },
-    },
-  }
-
-  /**
-   * Execute the superagent tool.
-   * This just marks the tool as executing - the actual work is done server-side
-   * by the superagent, and its output is streamed as subagent events.
-   */
-  async execute(_args?: SuperagentArgs): Promise<void> {
-    this.setState(ClientToolCallState.executing)
-  }
-}
-
-// Register UI config at module load
-registerToolUIConfig(SuperagentClientTool.id, SuperagentClientTool.metadata.uiConfig!)
--- a/apps/sim/lib/logs/get-trigger-options.ts
+++ b/apps/sim/lib/logs/get-trigger-options.ts
@@ -1,4 +1,4 @@
-import { getLatestBlock } from '@/blocks/registry'
+import { getBlock } from '@/blocks/registry'
 import { getAllTriggers } from '@/triggers'

 export interface TriggerOption {
@@ -49,13 +49,22 @@ export function getTriggerOptions(): TriggerOption[] {
      continue
    }

-    const block = getLatestBlock(provider)
+    const block = getBlock(provider)

-    providerMap.set(provider, {
-      value: provider,
-      label: block?.name || formatProviderName(provider),
-      color: block?.bgColor || '#6b7280',
-    })
+    if (block) {
+      providerMap.set(provider, {
+        value: provider,
+        label: block.name, // Use block's display name (e.g., "Slack", "GitHub")
+        color: block.bgColor || '#6b7280', // Use block's hex color, fallback to gray
+      })
+    } else {
+      const label = formatProviderName(provider)
+      providerMap.set(provider, {
+        value: provider,
+        label,
+        color: '#6b7280', // gray fallback
+      })
+    }
  }

  const integrationOptions = Array.from(providerMap.values()).sort((a, b) =>
--- a/apps/sim/lib/webhooks/utils.server.ts
+++ b/apps/sim/lib/webhooks/utils.server.ts
--- a/apps/sim/lib/workflows/comparison/compare.test.ts
+++ b/apps/sim/lib/workflows/comparison/compare.test.ts
@@ -2290,7 +2290,7 @@ describe('hasWorkflowChanged', () => {
          block1: createBlock('block1', {
            type: 'starter',
            subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
              webhookId: { value: null },
            },
          }),
@@ -2302,7 +2302,7 @@ describe('hasWorkflowChanged', () => {
          block1: createBlock('block1', {
            type: 'starter',
            subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
              webhookId: { value: 'wh_123456' },
            },
          }),
@@ -2318,7 +2318,7 @@ describe('hasWorkflowChanged', () => {
          block1: createBlock('block1', {
            type: 'starter',
            subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
              triggerPath: { value: '' },
            },
          }),
@@ -2330,7 +2330,7 @@ describe('hasWorkflowChanged', () => {
          block1: createBlock('block1', {
            type: 'starter',
            subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
              triggerPath: { value: '/api/webhooks/abc123' },
            },
          }),
@@ -2346,7 +2346,7 @@ describe('hasWorkflowChanged', () => {
          block1: createBlock('block1', {
            type: 'starter',
            subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
              webhookId: { value: null },
              triggerPath: { value: '' },
            },
@@ -2359,7 +2359,7 @@ describe('hasWorkflowChanged', () => {
          block1: createBlock('block1', {
            type: 'starter',
            subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
              webhookId: { value: 'wh_123456' },
              triggerPath: { value: '/api/webhooks/abc123' },
            },
@@ -2371,18 +2371,14 @@ describe('hasWorkflowChanged', () => {
    })

    it.concurrent(
-      'should detect change when actual config differs but runtime metadata also differs',
+      'should detect change when triggerConfig differs but runtime metadata also differs',
      () => {
-        // Test that when a real config field changes along with runtime metadata,
-        // the change is still detected. Using 'model' as the config field since
-        // triggerConfig is now excluded from comparison (individual trigger fields
-        // are compared separately).
        const deployedState = createWorkflowState({
          blocks: {
            block1: createBlock('block1', {
              type: 'starter',
              subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
                webhookId: { value: null },
              },
            }),
@@ -2394,7 +2390,7 @@ describe('hasWorkflowChanged', () => {
            block1: createBlock('block1', {
              type: 'starter',
              subBlocks: {
-                model: { value: 'gpt-4o' },
+                triggerConfig: { value: { event: 'pull_request' } },
                webhookId: { value: 'wh_123456' },
              },
            }),
@@ -2406,12 +2402,8 @@ describe('hasWorkflowChanged', () => {
    )

    it.concurrent(
-      'should not detect change when triggerConfig differs (individual fields compared separately)',
+      'should not detect change when runtime metadata is added to current state',
      () => {
-        // triggerConfig is excluded from comparison because:
-        // 1. Individual trigger fields are stored as separate subblocks and compared individually
-        // 2. The client populates triggerConfig with default values from trigger definitions,
-        //    which aren't present in the deployed state, causing false positive change detection
        const deployedState = createWorkflowState({
          blocks: {
            block1: createBlock('block1', {
@@ -2428,36 +2420,7 @@ describe('hasWorkflowChanged', () => {
            block1: createBlock('block1', {
              type: 'starter',
              subBlocks: {
-                triggerConfig: { value: { event: 'pull_request', extraField: true } },
-              },
-            }),
-          },
-        })
-
-        expect(hasWorkflowChanged(currentState, deployedState)).toBe(false)
-      }
-    )
-
-    it.concurrent(
-      'should not detect change when runtime metadata is added to current state',
-      () => {
-        const deployedState = createWorkflowState({
-          blocks: {
-            block1: createBlock('block1', {
-              type: 'starter',
-              subBlocks: {
-                model: { value: 'gpt-4' },
-              },
-            }),
-          },
-        })
-
-        const currentState = createWorkflowState({
-          blocks: {
-            block1: createBlock('block1', {
-              type: 'starter',
-              subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
                webhookId: { value: 'wh_123456' },
                triggerPath: { value: '/api/webhooks/abc123' },
              },
@@ -2477,7 +2440,7 @@ describe('hasWorkflowChanged', () => {
            block1: createBlock('block1', {
              type: 'starter',
              subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
                webhookId: { value: 'wh_old123' },
                triggerPath: { value: '/api/webhooks/old' },
              },
@@ -2490,7 +2453,7 @@ describe('hasWorkflowChanged', () => {
            block1: createBlock('block1', {
              type: 'starter',
              subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
              },
            }),
          },
--- a/apps/sim/stores/panel/copilot/store.ts
+++ b/apps/sim/stores/panel/copilot/store.ts
@@ -27,13 +27,11 @@ import {
 import { NavigateUIClientTool } from '@/lib/copilot/tools/client/navigation/navigate-ui'
 import { AuthClientTool } from '@/lib/copilot/tools/client/other/auth'
 import { CheckoffTodoClientTool } from '@/lib/copilot/tools/client/other/checkoff-todo'
-import { CrawlWebsiteClientTool } from '@/lib/copilot/tools/client/other/crawl-website'
 import { CustomToolClientTool } from '@/lib/copilot/tools/client/other/custom-tool'
 import { DebugClientTool } from '@/lib/copilot/tools/client/other/debug'
 import { DeployClientTool } from '@/lib/copilot/tools/client/other/deploy'
 import { EditClientTool } from '@/lib/copilot/tools/client/other/edit'
 import { EvaluateClientTool } from '@/lib/copilot/tools/client/other/evaluate'
-import { GetPageContentsClientTool } from '@/lib/copilot/tools/client/other/get-page-contents'
 import { InfoClientTool } from '@/lib/copilot/tools/client/other/info'
 import { KnowledgeClientTool } from '@/lib/copilot/tools/client/other/knowledge'
 import { MakeApiRequestClientTool } from '@/lib/copilot/tools/client/other/make-api-request'
@@ -42,7 +40,6 @@ import { OAuthRequestAccessClientTool } from '@/lib/copilot/tools/client/other/o
 import { PlanClientTool } from '@/lib/copilot/tools/client/other/plan'
 import { RememberDebugClientTool } from '@/lib/copilot/tools/client/other/remember-debug'
 import { ResearchClientTool } from '@/lib/copilot/tools/client/other/research'
-import { ScrapePageClientTool } from '@/lib/copilot/tools/client/other/scrape-page'
 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'
@@ -123,9 +120,6 @@ const CLIENT_TOOL_INSTANTIATORS: Record<string, (id: string) => any> = {
  search_library_docs: (id) => new SearchLibraryDocsClientTool(id),
  search_patterns: (id) => new SearchPatternsClientTool(id),
  search_errors: (id) => new SearchErrorsClientTool(id),
-  scrape_page: (id) => new ScrapePageClientTool(id),
-  get_page_contents: (id) => new GetPageContentsClientTool(id),
-  crawl_website: (id) => new CrawlWebsiteClientTool(id),
  remember_debug: (id) => new RememberDebugClientTool(id),
  set_environment_variables: (id) => new SetEnvironmentVariablesClientTool(id),
  get_credentials: (id) => new GetCredentialsClientTool(id),
@@ -185,9 +179,6 @@ export const CLASS_TOOL_METADATA: Record<string, BaseClientToolMetadata | undefi
  search_library_docs: (SearchLibraryDocsClientTool as any)?.metadata,
  search_patterns: (SearchPatternsClientTool as any)?.metadata,
  search_errors: (SearchErrorsClientTool as any)?.metadata,
-  scrape_page: (ScrapePageClientTool as any)?.metadata,
-  get_page_contents: (GetPageContentsClientTool as any)?.metadata,
-  crawl_website: (CrawlWebsiteClientTool as any)?.metadata,
  remember_debug: (RememberDebugClientTool as any)?.metadata,
  set_environment_variables: (SetEnvironmentVariablesClientTool as any)?.metadata,
  get_credentials: (GetCredentialsClientTool as any)?.metadata,
@@ -1223,20 +1214,30 @@ const sseHandlers: Record<string, SSEHandler> = {
      }
    } catch {}

-    // Integration tools: Stay in pending state until user confirms via buttons
-    // This handles tools like google_calendar_*, exa_*, gmail_read, etc. that aren't in the client registry
+    // Integration tools: Check if auto-allowed, otherwise wait for user confirmation
+    // This handles tools like google_calendar_*, exa_*, etc. that aren't in the client registry
    // Only relevant if mode is 'build' (agent)
-    const { mode, workflowId } = get()
+    const { mode, workflowId, autoAllowedTools } = get()
    if (mode === 'build' && workflowId) {
-      // Check if tool was NOT found in client registry
+      // Check if tool was NOT found in client registry (def is undefined from above)
      const def = name ? getTool(name) : undefined
      const inst = getClientTool(id) as any
      if (!def && !inst && name) {
-        // Integration tools stay in pending state until user confirms
-        logger.info('[build mode] Integration tool awaiting user confirmation', {
-          id,
-          name,
-        })
+        // Check if this tool is auto-allowed
+        if (autoAllowedTools.includes(name)) {
+          logger.info('[build mode] Integration tool auto-allowed, executing', { id, name })
+
+          // Auto-execute the tool
+          setTimeout(() => {
+            get().executeIntegrationTool(id)
+          }, 0)
+        } else {
+          // Integration tools stay in pending state until user confirms
+          logger.info('[build mode] Integration tool awaiting user confirmation', {
+            id,
+            name,
+          })
+        }
      }
    }
  },
@@ -1853,7 +1854,7 @@ const subAgentSSEHandlers: Record<string, SSEHandler> = {

    updateToolCallWithSubAgentData(context, get, set, parentToolCallId)

-    // Execute client tools in parallel (non-blocking) - same pattern as main tool_call handler
+    // Execute client tools (same logic as main tool_call handler)
    try {
      const def = getTool(name)
      if (def) {
@@ -1862,33 +1863,29 @@ const subAgentSSEHandlers: Record<string, SSEHandler> = {
            ? !!def.hasInterrupt(args || {})
            : !!def.hasInterrupt
        if (!hasInterrupt) {
-          // Auto-execute tools without interrupts - non-blocking
+          // Auto-execute tools without interrupts
          const ctx = createExecutionContext({ toolCallId: id, toolName: name })
-          Promise.resolve()
-            .then(() => def.execute(ctx, args || {}))
-            .catch((execErr: any) => {
-              logger.error('[SubAgent] Tool execution failed', {
-                id,
-                name,
-                error: execErr?.message,
-              })
-            })
+          try {
+            await def.execute(ctx, args || {})
+          } catch (execErr: any) {
+            logger.error('[SubAgent] Tool execution failed', { id, name, error: execErr?.message })
+          }
        }
      } else {
-        // Fallback to class-based tools - non-blocking
+        // Fallback to class-based tools
        const instance = getClientTool(id)
        if (instance) {
          const hasInterruptDisplays = !!instance.getInterruptDisplays?.()
          if (!hasInterruptDisplays) {
-            Promise.resolve()
-              .then(() => instance.execute(args || {}))
-              .catch((execErr: any) => {
-                logger.error('[SubAgent] Class tool execution failed', {
-                  id,
-                  name,
-                  error: execErr?.message,
-                })
+            try {
+              await instance.execute(args || {})
+            } catch (execErr: any) {
+              logger.error('[SubAgent] Class tool execution failed', {
+                id,
+                name,
+                error: execErr?.message,
              })
+            }
          }
        }
      }
@@ -2518,13 +2515,6 @@ export const useCopilotStore = create<CopilotStore>()(
        // Call copilot API
        const apiMode: 'ask' | 'agent' | 'plan' =
          mode === 'ask' ? 'ask' : mode === 'plan' ? 'plan' : 'agent'
-
-        // Extract slash commands from contexts (lowercase) and filter them out from contexts
-        const commands = contexts
-          ?.filter((c) => c.kind === 'slash_command' && 'command' in c)
-          .map((c) => (c as any).command.toLowerCase()) as string[] | undefined
-        const filteredContexts = contexts?.filter((c) => c.kind !== 'slash_command')
-
        const result = await sendStreamingMessage({
          message: messageToSend,
          userMessageId: userMessage.id,
@@ -2536,8 +2526,7 @@ export const useCopilotStore = create<CopilotStore>()(
          createNewChat: !currentChat,
          stream,
          fileAttachments,
-          contexts: filteredContexts,
-          commands: commands?.length ? commands : undefined,
+          contexts,
          abortSignal: abortController.signal,
        })

@@ -2629,14 +2618,13 @@ export const useCopilotStore = create<CopilotStore>()(
            ),
            isSendingMessage: false,
            isAborting: false,
-            // Keep abortController so streaming loop can check signal.aborted
-            // It will be nulled when streaming completes or new message starts
+            abortController: null,
          }))
        } else {
          set({
            isSendingMessage: false,
            isAborting: false,
-            // Keep abortController so streaming loop can check signal.aborted
+            abortController: null,
          })
        }

@@ -2665,7 +2653,7 @@ export const useCopilotStore = create<CopilotStore>()(
          } catch {}
        }
      } catch {
-        set({ isSendingMessage: false, isAborting: false })
+        set({ isSendingMessage: false, isAborting: false, abortController: null })
      }
    },

@@ -3166,7 +3154,6 @@ export const useCopilotStore = create<CopilotStore>()(
              : msg
          ),
          isSendingMessage: false,
-          isAborting: false,
          abortController: null,
          currentUserMessageId: null,
        }))
--- a/apps/sim/stores/panel/copilot/types.ts
+++ b/apps/sim/stores/panel/copilot/types.ts
@@ -85,7 +85,6 @@ export type ChatContext =
  | { kind: 'knowledge'; knowledgeId?: string; label: string }
  | { kind: 'templates'; templateId?: string; label: string }
  | { kind: 'docs'; label: string }
-  | { kind: 'slash_command'; command: string; label: string }

 import type { CopilotChat as ApiCopilotChat } from '@/lib/copilot/api'

--- a/apps/sim/stores/workflows/utils.ts
+++ b/apps/sim/stores/workflows/utils.ts
@@ -1,19 +1,5 @@
 import type { Edge } from 'reactflow'
 import { v4 as uuidv4 } from 'uuid'
-
-export function filterNewEdges(edgesToAdd: Edge[], currentEdges: Edge[]): Edge[] {
-  return edgesToAdd.filter((edge) => {
-    if (edge.source === edge.target) return false
-    return !currentEdges.some(
-      (e) =>
-        e.source === edge.source &&
-        e.sourceHandle === edge.sourceHandle &&
-        e.target === edge.target &&
-        e.targetHandle === edge.targetHandle
-    )
-  })
-}
-
 import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { getBlock } from '@/blocks'
 import { normalizeName } from '@/executor/constants'
--- a/apps/sim/stores/workflows/workflow/store.test.ts
+++ b/apps/sim/stores/workflows/workflow/store.test.ts
@@ -297,7 +297,7 @@ describe('workflow store', () => {
      expectEdgeConnects(edges, 'block-1', 'block-2')
    })

-    it('should not add duplicate connections', () => {
+    it('should not add duplicate edges', () => {
      const { addBlock, batchAddEdges } = useWorkflowStore.getState()

      addBlock('block-1', 'starter', 'Start', { x: 0, y: 0 })
@@ -309,6 +309,17 @@ describe('workflow store', () => {
      const state = useWorkflowStore.getState()
      expectEdgeCount(state, 1)
    })
+
+    it('should prevent self-referencing edges', () => {
+      const { addBlock, batchAddEdges } = useWorkflowStore.getState()
+
+      addBlock('block-1', 'function', 'Self', { x: 0, y: 0 })
+
+      batchAddEdges([{ id: 'e1', source: 'block-1', target: 'block-1' }])
+
+      const state = useWorkflowStore.getState()
+      expectEdgeCount(state, 0)
+    })
  })

  describe('batchRemoveEdges', () => {
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -9,12 +9,7 @@ import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import {
-  filterNewEdges,
-  getUniqueBlockName,
-  mergeSubblockState,
-  normalizeName,
-} from '@/stores/workflows/utils'
+import { getUniqueBlockName, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
 import type {
  Position,
  SubBlockState,
@@ -501,11 +496,25 @@ export const useWorkflowStore = create<WorkflowStore>()(

      batchAddEdges: (edges: Edge[]) => {
        const currentEdges = get().edges
-        const filtered = filterNewEdges(edges, currentEdges)
        const newEdges = [...currentEdges]
+        const existingEdgeIds = new Set(currentEdges.map((e) => e.id))
+        // Track existing connections to prevent duplicates (same source->target)
+        const existingConnections = new Set(currentEdges.map((e) => `${e.source}->${e.target}`))

-        for (const edge of filtered) {
+        for (const edge of edges) {
+          // Skip if edge ID already exists
+          if (existingEdgeIds.has(edge.id)) continue
+
+          // Skip self-referencing edges
+          if (edge.source === edge.target) continue
+
+          // Skip if connection already exists (same source and target)
+          const connectionKey = `${edge.source}->${edge.target}`
+          if (existingConnections.has(connectionKey)) continue
+
+          // Skip if would create a cycle
          if (wouldCreateCycle([...newEdges], edge.source, edge.target)) continue
+
          newEdges.push({
            id: edge.id || crypto.randomUUID(),
            source: edge.source,
@@ -515,6 +524,8 @@ export const useWorkflowStore = create<WorkflowStore>()(
            type: edge.type || 'default',
            data: edge.data || {},
          })
+          existingEdgeIds.add(edge.id)
+          existingConnections.add(connectionKey)
        }

        const blocks = get().blocks
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -1180,8 +1180,6 @@ import {
  slackCanvasTool,
  slackDeleteMessageTool,
  slackDownloadTool,
-  slackGetMessageTool,
-  slackGetThreadTool,
  slackGetUserTool,
  slackListChannelsTool,
  slackListMembersTool,
@@ -1733,8 +1731,6 @@ export const tools: Record<string, ToolConfig> = {
  slack_list_members: slackListMembersTool,
  slack_list_users: slackListUsersTool,
  slack_get_user: slackGetUserTool,
-  slack_get_message: slackGetMessageTool,
-  slack_get_thread: slackGetThreadTool,
  slack_canvas: slackCanvasTool,
  slack_download: slackDownloadTool,
  slack_update_message: slackUpdateMessageTool,
--- a/apps/sim/tools/slack/get_message.ts
+++ b/apps/sim/tools/slack/get_message.ts
@@ -1,213 +0,0 @@
-import type { SlackGetMessageParams, SlackGetMessageResponse } from '@/tools/slack/types'
-import type { ToolConfig } from '@/tools/types'
-
-export const slackGetMessageTool: ToolConfig<SlackGetMessageParams, SlackGetMessageResponse> = {
-  id: 'slack_get_message',
-  name: 'Slack Get Message',
-  description:
-    'Retrieve a specific message by its timestamp. Useful for getting a thread parent message.',
-  version: '1.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'slack',
-  },
-
-  params: {
-    authMethod: {
-      type: 'string',
-      required: false,
-      visibility: 'user-only',
-      description: 'Authentication method: oauth or bot_token',
-    },
-    botToken: {
-      type: 'string',
-      required: false,
-      visibility: 'user-only',
-      description: 'Bot token for Custom Bot',
-    },
-    accessToken: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'OAuth access token or bot token for Slack API',
-    },
-    channel: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'Slack channel ID (e.g., C1234567890)',
-    },
-    timestamp: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'Message timestamp to retrieve (e.g., 1405894322.002768)',
-    },
-  },
-
-  request: {
-    url: (params: SlackGetMessageParams) => {
-      const url = new URL('https://slack.com/api/conversations.history')
-      url.searchParams.append('channel', params.channel?.trim() ?? '')
-      url.searchParams.append('oldest', params.timestamp?.trim() ?? '')
-      url.searchParams.append('limit', '1')
-      url.searchParams.append('inclusive', 'true')
-      return url.toString()
-    },
-    method: 'GET',
-    headers: (params: SlackGetMessageParams) => ({
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${params.accessToken || params.botToken}`,
-    }),
-  },
-
-  transformResponse: async (response: Response) => {
-    const data = await response.json()
-
-    if (!data.ok) {
-      if (data.error === 'missing_scope') {
-        throw new Error(
-          'Missing required permissions. Please reconnect your Slack account with the necessary scopes (channels:history, groups:history).'
-        )
-      }
-      if (data.error === 'invalid_auth') {
-        throw new Error('Invalid authentication. Please check your Slack credentials.')
-      }
-      if (data.error === 'channel_not_found') {
-        throw new Error('Channel not found. Please check the channel ID.')
-      }
-      throw new Error(data.error || 'Failed to get message from Slack')
-    }
-
-    const messages = data.messages || []
-    if (messages.length === 0) {
-      throw new Error('Message not found')
-    }
-
-    const msg = messages[0]
-    const message = {
-      type: msg.type ?? 'message',
-      ts: msg.ts,
-      text: msg.text ?? '',
-      user: msg.user ?? null,
-      bot_id: msg.bot_id ?? null,
-      username: msg.username ?? null,
-      channel: msg.channel ?? null,
-      team: msg.team ?? null,
-      thread_ts: msg.thread_ts ?? null,
-      parent_user_id: msg.parent_user_id ?? null,
-      reply_count: msg.reply_count ?? null,
-      reply_users_count: msg.reply_users_count ?? null,
-      latest_reply: msg.latest_reply ?? null,
-      subscribed: msg.subscribed ?? null,
-      last_read: msg.last_read ?? null,
-      unread_count: msg.unread_count ?? null,
-      subtype: msg.subtype ?? null,
-      reactions: msg.reactions ?? [],
-      is_starred: msg.is_starred ?? false,
-      pinned_to: msg.pinned_to ?? [],
-      files: (msg.files ?? []).map((f: any) => ({
-        id: f.id,
-        name: f.name,
-        mimetype: f.mimetype,
-        size: f.size,
-        url_private: f.url_private ?? null,
-        permalink: f.permalink ?? null,
-        mode: f.mode ?? null,
-      })),
-      attachments: msg.attachments ?? [],
-      blocks: msg.blocks ?? [],
-      edited: msg.edited ?? null,
-      permalink: msg.permalink ?? null,
-    }
-
-    return {
-      success: true,
-      output: {
-        message,
-      },
-    }
-  },
-
-  outputs: {
-    message: {
-      type: 'object',
-      description: 'The retrieved message object',
-      properties: {
-        type: { type: 'string', description: 'Message type' },
-        ts: { type: 'string', description: 'Message timestamp' },
-        text: { type: 'string', description: 'Message text content' },
-        user: { type: 'string', description: 'User ID who sent the message' },
-        bot_id: { type: 'string', description: 'Bot ID if sent by a bot', optional: true },
-        username: { type: 'string', description: 'Display username', optional: true },
-        channel: { type: 'string', description: 'Channel ID', optional: true },
-        team: { type: 'string', description: 'Team ID', optional: true },
-        thread_ts: { type: 'string', description: 'Thread parent timestamp', optional: true },
-        parent_user_id: { type: 'string', description: 'User ID of thread parent', optional: true },
-        reply_count: { type: 'number', description: 'Number of thread replies', optional: true },
-        reply_users_count: {
-          type: 'number',
-          description: 'Number of users who replied',
-          optional: true,
-        },
-        latest_reply: { type: 'string', description: 'Timestamp of latest reply', optional: true },
-        subtype: { type: 'string', description: 'Message subtype', optional: true },
-        reactions: {
-          type: 'array',
-          description: 'Array of reactions on this message',
-          items: {
-            type: 'object',
-            properties: {
-              name: { type: 'string', description: 'Emoji name' },
-              count: { type: 'number', description: 'Number of reactions' },
-              users: {
-                type: 'array',
-                description: 'User IDs who reacted',
-                items: { type: 'string' },
-              },
-            },
-          },
-        },
-        is_starred: { type: 'boolean', description: 'Whether message is starred', optional: true },
-        pinned_to: {
-          type: 'array',
-          description: 'Channel IDs where message is pinned',
-          items: { type: 'string' },
-          optional: true,
-        },
-        files: {
-          type: 'array',
-          description: 'Files attached to message',
-          items: {
-            type: 'object',
-            properties: {
-              id: { type: 'string', description: 'File ID' },
-              name: { type: 'string', description: 'File name' },
-              mimetype: { type: 'string', description: 'MIME type' },
-              size: { type: 'number', description: 'File size in bytes' },
-              url_private: { type: 'string', description: 'Private download URL' },
-              permalink: { type: 'string', description: 'Permanent link to file' },
-            },
-          },
-        },
-        attachments: {
-          type: 'array',
-          description: 'Legacy attachments',
-          items: { type: 'object' },
-        },
-        blocks: { type: 'array', description: 'Block Kit blocks', items: { type: 'object' } },
-        edited: {
-          type: 'object',
-          description: 'Edit information if message was edited',
-          properties: {
-            user: { type: 'string', description: 'User ID who edited' },
-            ts: { type: 'string', description: 'Edit timestamp' },
-          },
-          optional: true,
-        },
-        permalink: { type: 'string', description: 'Permanent link to message', optional: true },
-      },
-    },
-  },
-}
--- a/apps/sim/tools/slack/get_thread.ts
+++ b/apps/sim/tools/slack/get_thread.ts
@@ -1,224 +0,0 @@
-import type { SlackGetThreadParams, SlackGetThreadResponse } from '@/tools/slack/types'
-import type { ToolConfig } from '@/tools/types'
-
-export const slackGetThreadTool: ToolConfig<SlackGetThreadParams, SlackGetThreadResponse> = {
-  id: 'slack_get_thread',
-  name: 'Slack Get Thread',
-  description:
-    'Retrieve an entire thread including the parent message and all replies. Useful for getting full conversation context.',
-  version: '1.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'slack',
-  },
-
-  params: {
-    authMethod: {
-      type: 'string',
-      required: false,
-      visibility: 'user-only',
-      description: 'Authentication method: oauth or bot_token',
-    },
-    botToken: {
-      type: 'string',
-      required: false,
-      visibility: 'user-only',
-      description: 'Bot token for Custom Bot',
-    },
-    accessToken: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'OAuth access token or bot token for Slack API',
-    },
-    channel: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'Slack channel ID (e.g., C1234567890)',
-    },
-    threadTs: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'Thread timestamp (thread_ts) to retrieve (e.g., 1405894322.002768)',
-    },
-    limit: {
-      type: 'number',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Maximum number of messages to return (default: 100, max: 200)',
-    },
-  },
-
-  request: {
-    url: (params: SlackGetThreadParams) => {
-      const url = new URL('https://slack.com/api/conversations.replies')
-      url.searchParams.append('channel', params.channel?.trim() ?? '')
-      url.searchParams.append('ts', params.threadTs?.trim() ?? '')
-      url.searchParams.append('inclusive', 'true')
-      const limit = params.limit ? Math.min(Number(params.limit), 200) : 100
-      url.searchParams.append('limit', String(limit))
-      return url.toString()
-    },
-    method: 'GET',
-    headers: (params: SlackGetThreadParams) => ({
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${params.accessToken || params.botToken}`,
-    }),
-  },
-
-  transformResponse: async (response: Response) => {
-    const data = await response.json()
-
-    if (!data.ok) {
-      if (data.error === 'missing_scope') {
-        throw new Error(
-          'Missing required permissions. Please reconnect your Slack account with the necessary scopes (channels:history, groups:history).'
-        )
-      }
-      if (data.error === 'invalid_auth') {
-        throw new Error('Invalid authentication. Please check your Slack credentials.')
-      }
-      if (data.error === 'channel_not_found') {
-        throw new Error('Channel not found. Please check the channel ID.')
-      }
-      if (data.error === 'thread_not_found') {
-        throw new Error('Thread not found. Please check the thread timestamp.')
-      }
-      throw new Error(data.error || 'Failed to get thread from Slack')
-    }
-
-    const rawMessages = data.messages || []
-    if (rawMessages.length === 0) {
-      throw new Error('Thread not found')
-    }
-
-    const messages = rawMessages.map((msg: any) => ({
-      type: msg.type ?? 'message',
-      ts: msg.ts,
-      text: msg.text ?? '',
-      user: msg.user ?? null,
-      bot_id: msg.bot_id ?? null,
-      username: msg.username ?? null,
-      channel: msg.channel ?? null,
-      team: msg.team ?? null,
-      thread_ts: msg.thread_ts ?? null,
-      parent_user_id: msg.parent_user_id ?? null,
-      reply_count: msg.reply_count ?? null,
-      reply_users_count: msg.reply_users_count ?? null,
-      latest_reply: msg.latest_reply ?? null,
-      subscribed: msg.subscribed ?? null,
-      last_read: msg.last_read ?? null,
-      unread_count: msg.unread_count ?? null,
-      subtype: msg.subtype ?? null,
-      reactions: msg.reactions ?? [],
-      is_starred: msg.is_starred ?? false,
-      pinned_to: msg.pinned_to ?? [],
-      files: (msg.files ?? []).map((f: any) => ({
-        id: f.id,
-        name: f.name,
-        mimetype: f.mimetype,
-        size: f.size,
-        url_private: f.url_private ?? null,
-        permalink: f.permalink ?? null,
-        mode: f.mode ?? null,
-      })),
-      attachments: msg.attachments ?? [],
-      blocks: msg.blocks ?? [],
-      edited: msg.edited ?? null,
-      permalink: msg.permalink ?? null,
-    }))
-
-    // First message is always the parent
-    const parentMessage = messages[0]
-    // Remaining messages are replies
-    const replies = messages.slice(1)
-
-    return {
-      success: true,
-      output: {
-        parentMessage,
-        replies,
-        messages,
-        replyCount: replies.length,
-        hasMore: data.has_more ?? false,
-      },
-    }
-  },
-
-  outputs: {
-    parentMessage: {
-      type: 'object',
-      description: 'The thread parent message',
-      properties: {
-        type: { type: 'string', description: 'Message type' },
-        ts: { type: 'string', description: 'Message timestamp' },
-        text: { type: 'string', description: 'Message text content' },
-        user: { type: 'string', description: 'User ID who sent the message' },
-        bot_id: { type: 'string', description: 'Bot ID if sent by a bot', optional: true },
-        username: { type: 'string', description: 'Display username', optional: true },
-        reply_count: { type: 'number', description: 'Total number of thread replies' },
-        reply_users_count: { type: 'number', description: 'Number of users who replied' },
-        latest_reply: { type: 'string', description: 'Timestamp of latest reply' },
-        reactions: {
-          type: 'array',
-          description: 'Array of reactions on the parent message',
-          items: {
-            type: 'object',
-            properties: {
-              name: { type: 'string', description: 'Emoji name' },
-              count: { type: 'number', description: 'Number of reactions' },
-              users: {
-                type: 'array',
-                description: 'User IDs who reacted',
-                items: { type: 'string' },
-              },
-            },
-          },
-        },
-        files: {
-          type: 'array',
-          description: 'Files attached to the parent message',
-          items: {
-            type: 'object',
-            properties: {
-              id: { type: 'string', description: 'File ID' },
-              name: { type: 'string', description: 'File name' },
-              mimetype: { type: 'string', description: 'MIME type' },
-              size: { type: 'number', description: 'File size in bytes' },
-            },
-          },
-        },
-      },
-    },
-    replies: {
-      type: 'array',
-      description: 'Array of reply messages in the thread (excluding the parent)',
-      items: {
-        type: 'object',
-        properties: {
-          ts: { type: 'string', description: 'Message timestamp' },
-          text: { type: 'string', description: 'Message text content' },
-          user: { type: 'string', description: 'User ID who sent the reply' },
-          reactions: { type: 'array', description: 'Reactions on the reply' },
-          files: { type: 'array', description: 'Files attached to the reply' },
-        },
-      },
-    },
-    messages: {
-      type: 'array',
-      description: 'All messages in the thread (parent + replies) in chronological order',
-      items: { type: 'object' },
-    },
-    replyCount: {
-      type: 'number',
-      description: 'Number of replies returned in this response',
-    },
-    hasMore: {
-      type: 'boolean',
-      description: 'Whether there are more messages in the thread (pagination needed)',
-    },
-  },
-}
--- a/apps/sim/tools/slack/index.ts
+++ b/apps/sim/tools/slack/index.ts
@@ -2,8 +2,6 @@ import { slackAddReactionTool } from '@/tools/slack/add_reaction'
 import { slackCanvasTool } from '@/tools/slack/canvas'
 import { slackDeleteMessageTool } from '@/tools/slack/delete_message'
 import { slackDownloadTool } from '@/tools/slack/download'
-import { slackGetMessageTool } from '@/tools/slack/get_message'
-import { slackGetThreadTool } from '@/tools/slack/get_thread'
 import { slackGetUserTool } from '@/tools/slack/get_user'
 import { slackListChannelsTool } from '@/tools/slack/list_channels'
 import { slackListMembersTool } from '@/tools/slack/list_members'
@@ -24,6 +22,4 @@ export {
  slackListMembersTool,
  slackListUsersTool,
  slackGetUserTool,
-  slackGetMessageTool,
-  slackGetThreadTool,
 }
--- a/apps/sim/tools/slack/types.ts
+++ b/apps/sim/tools/slack/types.ts
@@ -71,17 +71,6 @@ export interface SlackGetUserParams extends SlackBaseParams {
  userId: string
 }

-export interface SlackGetMessageParams extends SlackBaseParams {
-  channel: string
-  timestamp: string
-}
-
-export interface SlackGetThreadParams extends SlackBaseParams {
-  channel: string
-  threadTs: string
-  limit?: number
-}
-
 export interface SlackMessageResponse extends ToolResponse {
  output: {
    // Legacy properties for backward compatibility
@@ -316,22 +305,6 @@ export interface SlackGetUserResponse extends ToolResponse {
  }
 }

-export interface SlackGetMessageResponse extends ToolResponse {
-  output: {
-    message: SlackMessage
-  }
-}
-
-export interface SlackGetThreadResponse extends ToolResponse {
-  output: {
-    parentMessage: SlackMessage
-    replies: SlackMessage[]
-    messages: SlackMessage[]
-    replyCount: number
-    hasMore: boolean
-  }
-}
-
 export type SlackResponse =
  | SlackCanvasResponse
  | SlackMessageReaderResponse
@@ -344,5 +317,3 @@ export type SlackResponse =
  | SlackListMembersResponse
  | SlackListUsersResponse
  | SlackGetUserResponse
-  | SlackGetMessageResponse
-  | SlackGetThreadResponse
--- a/apps/sim/tools/utils.ts
+++ b/apps/sim/tools/utils.ts
@@ -3,7 +3,6 @@ import { getBaseUrl } from '@/lib/core/utils/urls'
 import { AGENT, isCustomTool } from '@/executor/constants'
 import { useCustomToolsStore } from '@/stores/custom-tools'
 import { useEnvironmentStore } from '@/stores/settings/environment'
-import { extractErrorMessage } from '@/tools/error-extractors'
 import { tools } from '@/tools/registry'
 import type { TableRow, ToolConfig, ToolResponse } from '@/tools/types'

@@ -163,22 +162,14 @@ export async function executeRequest(
    const externalResponse = await fetch(url, { method, headers, body })

    if (!externalResponse.ok) {
-      let errorData: any
+      let errorContent
      try {
-        errorData = await externalResponse.json()
+        errorContent = await externalResponse.json()
      } catch (_e) {
-        try {
-          errorData = await externalResponse.text()
-        } catch (_e2) {
-          errorData = null
-        }
+        errorContent = { message: externalResponse.statusText }
      }

-      const error = extractErrorMessage({
-        status: externalResponse.status,
-        statusText: externalResponse.statusText,
-        data: errorData,
-      })
+      const error = errorContent.message || `${toolId} API error: ${externalResponse.statusText}`
      logger.error(`${toolId} error:`, { error })
      throw new Error(error)
    }
--- a/apps/sim/triggers/circleback/utils.ts
+++ b/apps/sim/triggers/circleback/utils.ts
@@ -96,3 +96,23 @@ export function buildMeetingOutputs(): Record<string, TriggerOutput> {
    },
  } as Record<string, TriggerOutput>
 }
+
+/**
+ * Build output schema for generic webhook events
+ */
+export function buildGenericOutputs(): Record<string, TriggerOutput> {
+  return {
+    payload: {
+      type: 'object',
+      description: 'Raw webhook payload',
+    },
+    headers: {
+      type: 'object',
+      description: 'Request headers',
+    },
+    timestamp: {
+      type: 'string',
+      description: 'ISO8601 received timestamp',
+    },
+  } as Record<string, TriggerOutput>
+}
--- a/apps/sim/triggers/circleback/webhook.ts
+++ b/apps/sim/triggers/circleback/webhook.ts
@@ -1,6 +1,6 @@
 import { CirclebackIcon } from '@/components/icons'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildMeetingOutputs, circlebackSetupInstructions, circlebackTriggerOptions } from './utils'
+import { buildGenericOutputs, circlebackSetupInstructions, circlebackTriggerOptions } from './utils'

 export const circlebackWebhookTrigger: TriggerConfig = {
  id: 'circleback_webhook',
@@ -74,7 +74,7 @@ export const circlebackWebhookTrigger: TriggerConfig = {
    },
  ],

-  outputs: buildMeetingOutputs(),
+  outputs: buildGenericOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/constants.ts
+++ b/apps/sim/triggers/constants.ts
@@ -31,14 +31,8 @@ export const TRIGGER_PERSISTED_SUBBLOCK_IDS: string[] = [
 /**
 * 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.
- *
- * Note: 'triggerConfig' is included because it's an aggregate of individual trigger
- * field subblocks. Those individual fields are compared separately, so comparing
- * triggerConfig would be redundant. Additionally, the client populates triggerConfig
- * with default values from the trigger definition on load, which aren't present in
- * the deployed state, causing false positive change detection.
 */
-export const TRIGGER_RUNTIME_SUBBLOCK_IDS: string[] = ['webhookId', 'triggerPath', 'triggerConfig']
+export const TRIGGER_RUNTIME_SUBBLOCK_IDS: string[] = ['webhookId', 'triggerPath']

 /**
 * Maximum number of consecutive failures before a trigger (schedule/webhook) is auto-disabled.
--- a/apps/sim/triggers/github/issue_closed.ts
+++ b/apps/sim/triggers/github/issue_closed.ts
@@ -116,11 +116,6 @@ export const githubIssueClosedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description:
-        'GitHub event type from X-GitHub-Event header (e.g., issues, pull_request, push)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (opened, closed, reopened, edited, etc.)',
--- a/apps/sim/triggers/github/issue_comment.ts
+++ b/apps/sim/triggers/github/issue_comment.ts
@@ -117,10 +117,6 @@ export const githubIssueCommentTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., issue_comment)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (created, edited, deleted)',
--- a/apps/sim/triggers/github/issue_opened.ts
+++ b/apps/sim/triggers/github/issue_opened.ts
@@ -137,11 +137,6 @@ export const githubIssueOpenedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description:
-        'GitHub event type from X-GitHub-Event header (e.g., issues, pull_request, push)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (opened, closed, reopened, edited, etc.)',
--- a/apps/sim/triggers/github/pr_closed.ts
+++ b/apps/sim/triggers/github/pr_closed.ts
@@ -117,10 +117,6 @@ export const githubPRClosedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (opened, closed, synchronize, reopened, edited, etc.)',
--- a/apps/sim/triggers/github/pr_comment.ts
+++ b/apps/sim/triggers/github/pr_comment.ts
@@ -117,10 +117,6 @@ export const githubPRCommentTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., issue_comment)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (created, edited, deleted)',
--- a/apps/sim/triggers/github/pr_merged.ts
+++ b/apps/sim/triggers/github/pr_merged.ts
@@ -116,10 +116,6 @@ export const githubPRMergedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (opened, closed, synchronize, reopened, edited, etc.)',
--- a/apps/sim/triggers/github/pr_opened.ts
+++ b/apps/sim/triggers/github/pr_opened.ts
@@ -116,10 +116,6 @@ export const githubPROpenedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (opened, closed, synchronize, reopened, edited, etc.)',
--- a/apps/sim/triggers/github/pr_reviewed.ts
+++ b/apps/sim/triggers/github/pr_reviewed.ts
@@ -117,10 +117,6 @@ export const githubPRReviewedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request_review)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (submitted, edited, dismissed)',
--- a/apps/sim/triggers/github/push.ts
+++ b/apps/sim/triggers/github/push.ts
@@ -116,14 +116,6 @@ export const githubPushTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., push)',
-    },
-    branch: {
-      type: 'string',
-      description: 'Branch name derived from ref (e.g., main from refs/heads/main)',
-    },
    ref: {
      type: 'string',
      description: 'Git reference that was pushed (e.g., refs/heads/main)',
--- a/apps/sim/triggers/github/release_published.ts
+++ b/apps/sim/triggers/github/release_published.ts
@@ -116,10 +116,6 @@ export const githubReleasePublishedTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., release)',
-    },
    action: {
      type: 'string',
      description:
--- a/apps/sim/triggers/github/workflow_run.ts
+++ b/apps/sim/triggers/github/workflow_run.ts
@@ -117,10 +117,6 @@ export const githubWorkflowRunTrigger: TriggerConfig = {
  ],

  outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., workflow_run)',
-    },
    action: {
      type: 'string',
      description: 'Action performed (requested, in_progress, completed)',
--- a/apps/sim/triggers/jira/utils.ts
+++ b/apps/sim/triggers/jira/utils.ts
@@ -265,6 +265,11 @@ function buildBaseWebhookOutputs(): Record<string, TriggerOutput> {
        },
      },
    },
+
+    webhook: {
+      type: 'json',
+      description: 'Webhook metadata including provider, path, and raw payload',
+    },
  }
 }

--- a/apps/sim/triggers/lemlist/email_bounced.ts
+++ b/apps/sim/triggers/lemlist/email_bounced.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailBouncedOutputs,
+  buildActivityOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailBouncedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_email_bounced'),
  }),

-  outputs: buildEmailBouncedOutputs(),
+  outputs: buildActivityOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/email_clicked.ts
+++ b/apps/sim/triggers/lemlist/email_clicked.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailClickedOutputs,
+  buildActivityOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailClickedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_email_clicked'),
  }),

-  outputs: buildEmailClickedOutputs(),
+  outputs: buildActivityOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/email_opened.ts
+++ b/apps/sim/triggers/lemlist/email_opened.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailOpenedOutputs,
+  buildActivityOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailOpenedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_email_opened'),
  }),

-  outputs: buildEmailOpenedOutputs(),
+  outputs: buildActivityOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/email_replied.ts
+++ b/apps/sim/triggers/lemlist/email_replied.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailRepliedOutputs,
+  buildEmailReplyOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -30,7 +30,7 @@ export const lemlistEmailRepliedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_email_replied'),
  }),

-  outputs: buildEmailRepliedOutputs(),
+  outputs: buildEmailReplyOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/email_sent.ts
+++ b/apps/sim/triggers/lemlist/email_sent.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailSentOutputs,
+  buildActivityOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailSentTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_email_sent'),
  }),

-  outputs: buildEmailSentOutputs(),
+  outputs: buildActivityOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/interested.ts
+++ b/apps/sim/triggers/lemlist/interested.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildInterestOutputs,
+  buildActivityOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistInterestedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_interested'),
  }),

-  outputs: buildInterestOutputs(),
+  outputs: buildActivityOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/linkedin_replied.ts
+++ b/apps/sim/triggers/lemlist/linkedin_replied.ts
@@ -2,7 +2,7 @@ import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
  buildLemlistExtraFields,
-  buildLinkedInRepliedOutputs,
+  buildLinkedInReplyOutputs,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
 } from '@/triggers/lemlist/utils'
@@ -27,7 +27,7 @@ export const lemlistLinkedInRepliedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_linkedin_replied'),
  }),

-  outputs: buildLinkedInRepliedOutputs(),
+  outputs: buildLinkedInReplyOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/not_interested.ts
+++ b/apps/sim/triggers/lemlist/not_interested.ts
@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildInterestOutputs,
+  buildActivityOutputs,
  buildLemlistExtraFields,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistNotInterestedTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_not_interested'),
  }),

-  outputs: buildInterestOutputs(),
+  outputs: buildActivityOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/lemlist/utils.ts
+++ b/apps/sim/triggers/lemlist/utils.ts
@@ -66,254 +66,203 @@ export function buildLemlistExtraFields(triggerId: string) {
 }

 /**
- * Core fields present in ALL Lemlist webhook payloads
- * See: https://help.lemlist.com/en/articles/9423940-use-the-api-to-list-activity-types
+ * Base activity outputs shared across all Lemlist triggers
 */
-const coreOutputs = {
-  _id: {
-    type: 'string',
-    description: 'Unique activity identifier',
-  },
-  type: {
-    type: 'string',
-    description: 'Activity type (e.g., emailsSent, emailsReplied)',
-  },
-  createdAt: {
-    type: 'string',
-    description: 'Activity creation timestamp (ISO 8601)',
-  },
-  teamId: {
-    type: 'string',
-    description: 'Lemlist team identifier',
-  },
-  leadId: {
-    type: 'string',
-    description: 'Lead identifier',
-  },
-  campaignId: {
-    type: 'string',
-    description: 'Campaign identifier',
-  },
-  campaignName: {
-    type: 'string',
-    description: 'Campaign name',
-  },
-} as const
-
-/**
- * Lead fields present in webhook payloads
- */
-const leadOutputs = {
-  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',
-  },
-  linkedinUrl: {
-    type: 'string',
-    description: 'Lead LinkedIn profile URL',
-  },
-} as const
-
-/**
- * Sequence/campaign tracking fields for email activities
- */
-const sequenceOutputs = {
-  sequenceId: {
-    type: 'string',
-    description: 'Sequence identifier',
-  },
-  sequenceStep: {
-    type: 'number',
-    description: 'Current step in the sequence (0-indexed)',
-  },
-  totalSequenceStep: {
-    type: 'number',
-    description: 'Total number of steps in the sequence',
-  },
-  isFirst: {
-    type: 'boolean',
-    description: 'Whether this is the first activity of this type for this step',
-  },
-} as const
-
-/**
- * Sender information fields
- */
-const senderOutputs = {
-  sendUserId: {
-    type: 'string',
-    description: 'Sender user identifier',
-  },
-  sendUserEmail: {
-    type: 'string',
-    description: 'Sender email address',
-  },
-  sendUserName: {
-    type: 'string',
-    description: 'Sender display name',
-  },
-} as const
-
-/**
- * Email content fields
- */
-const emailContentOutputs = {
-  subject: {
-    type: 'string',
-    description: 'Email subject line',
-  },
-  text: {
-    type: 'string',
-    description: 'Email body content (HTML)',
-  },
-  messageId: {
-    type: 'string',
-    description: 'Email message ID (RFC 2822 format)',
-  },
-  emailId: {
-    type: 'string',
-    description: 'Lemlist email identifier',
-  },
-} as const
-
-/**
- * Build outputs for email sent events
- */
-export function buildEmailSentOutputs(): Record<string, TriggerOutput> {
+function buildBaseActivityOutputs(): Record<string, TriggerOutput> {
  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    ...emailContentOutputs,
-  } as Record<string, TriggerOutput>
+    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)',
+    },
+  }
 }

 /**
- * Build outputs for email replied events
+ * Lead outputs - information about the lead
 */
-export function buildEmailRepliedOutputs(): Record<string, TriggerOutput> {
+function buildLeadOutputs(): Record<string, TriggerOutput> {
  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    ...emailContentOutputs,
-  } as Record<string, TriggerOutput>
+    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',
+      },
+    },
+  }
 }

 /**
- * Build outputs for email opened events
+ * Standard activity outputs (activity + lead data)
 */
-export function buildEmailOpenedOutputs(): Record<string, TriggerOutput> {
+export function buildActivityOutputs(): Record<string, TriggerOutput> {
  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
+    ...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 that was opened',
+      description: 'Email message ID',
    },
-  } as Record<string, TriggerOutput>
-}
-
-/**
- * Build outputs for email clicked events
- */
-export function buildEmailClickedOutputs(): Record<string, TriggerOutput> {
-  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    messageId: {
+    subject: {
      type: 'string',
-      description: 'Email message ID containing the clicked link',
+      description: 'Email subject line',
    },
-    clickedUrl: {
-      type: 'string',
-      description: 'URL that was clicked',
-    },
-  } as Record<string, TriggerOutput>
-}
-
-/**
- * Build outputs for email bounced events
- */
-export function buildEmailBouncedOutputs(): Record<string, TriggerOutput> {
-  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    messageId: {
-      type: 'string',
-      description: 'Email message ID that bounced',
-    },
-    errorMessage: {
-      type: 'string',
-      description: 'Bounce error message',
-    },
-  } as Record<string, TriggerOutput>
-}
-
-/**
- * Build outputs for LinkedIn replied events
- */
-export function buildLinkedInRepliedOutputs(): Record<string, TriggerOutput> {
-  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
    text: {
      type: 'string',
-      description: 'LinkedIn message content',
+      description: 'Email reply text content',
    },
-  } as Record<string, TriggerOutput>
+    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',
+    },
+  }
 }

 /**
- * Build outputs for interested/not interested events
+ * LinkedIn-specific outputs (includes message content)
 */
-export function buildInterestOutputs(): Record<string, TriggerOutput> {
+export function buildLinkedInReplyOutputs(): Record<string, TriggerOutput> {
  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-  } as Record<string, TriggerOutput>
+    ...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',
+    },
+  }
 }

 /**
- * Build outputs for generic webhook (all events)
- * Includes all possible fields across event types
+ * All outputs for generic webhook (activity + lead + all possible fields)
 */
-export function buildLemlistOutputs(): Record<string, TriggerOutput> {
+export function buildAllOutputs(): Record<string, TriggerOutput> {
  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    ...emailContentOutputs,
-    clickedUrl: {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    messageId: {
      type: 'string',
-      description: 'URL that was clicked (for emailsClicked events)',
+      description: 'Message ID (for email/LinkedIn events)',
    },
-    errorMessage: {
+    subject: {
      type: 'string',
-      description: 'Error message (for bounce/failed events)',
+      description: 'Email subject (for email events)',
    },
-  } as Record<string, TriggerOutput>
+    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',
+    },
+  }
 }
--- a/apps/sim/triggers/lemlist/webhook.ts
+++ b/apps/sim/triggers/lemlist/webhook.ts
@@ -1,8 +1,8 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
+  buildAllOutputs,
  buildLemlistExtraFields,
-  buildLemlistOutputs,
  lemlistSetupInstructions,
  lemlistTriggerOptions,
 } from '@/triggers/lemlist/utils'
@@ -27,7 +27,7 @@ export const lemlistWebhookTrigger: TriggerConfig = {
    extraFields: buildLemlistExtraFields('lemlist_webhook'),
  }),

-  outputs: buildLemlistOutputs(),
+  outputs: buildAllOutputs(),

  webhook: {
    method: 'POST',
--- a/apps/sim/triggers/telegram/webhook.ts
+++ b/apps/sim/triggers/telegram/webhook.ts
@@ -110,7 +110,6 @@ export const telegramWebhookTrigger: TriggerConfig = {
    },
    sender: {
      id: { type: 'number', description: 'Sender user ID' },
-      username: { type: 'string', description: 'Sender username (if available)' },
      firstName: { type: 'string', description: 'Sender first name' },
      lastName: { type: 'string', description: 'Sender last name' },
      languageCode: { type: 'string', description: 'Sender language code (if available)' },
--- a/apps/sim/triggers/typeform/webhook.ts
+++ b/apps/sim/triggers/typeform/webhook.ts
@@ -136,8 +136,6 @@ export const typeformWebhookTrigger: TriggerConfig = {
        'Array of respondent answers (only includes answered questions). Each answer contains type, value, and field reference.',
    },
    definition: {
-      description:
-        'Form definition (only included when "Include Form Definition" is enabled in trigger settings)',
      id: {
        type: 'string',
        description: 'Form ID',
--- a/apps/sim/triggers/webflow/collection_item_changed.ts
+++ b/apps/sim/triggers/webflow/collection_item_changed.ts
@@ -96,6 +96,10 @@ export const webflowCollectionItemChangedTrigger: TriggerConfig = {
      type: 'string',
      description: 'The site ID where the event occurred',
    },
+    workspaceId: {
+      type: 'string',
+      description: 'The workspace ID where the event occurred',
+    },
    collectionId: {
      type: 'string',
      description: 'The collection ID where the item was changed',
--- a/apps/sim/triggers/webflow/collection_item_created.ts
+++ b/apps/sim/triggers/webflow/collection_item_created.ts
@@ -109,6 +109,10 @@ export const webflowCollectionItemCreatedTrigger: TriggerConfig = {
      type: 'string',
      description: 'The site ID where the event occurred',
    },
+    workspaceId: {
+      type: 'string',
+      description: 'The workspace ID where the event occurred',
+    },
    collectionId: {
      type: 'string',
      description: 'The collection ID where the item was created',
--- a/apps/sim/triggers/webflow/collection_item_deleted.ts
+++ b/apps/sim/triggers/webflow/collection_item_deleted.ts
@@ -97,6 +97,10 @@ export const webflowCollectionItemDeletedTrigger: TriggerConfig = {
      type: 'string',
      description: 'The site ID where the event occurred',
    },
+    workspaceId: {
+      type: 'string',
+      description: 'The workspace ID where the event occurred',
+    },
    collectionId: {
      type: 'string',
      description: 'The collection ID where the item was deleted',
--- a/apps/sim/triggers/webflow/form_submission.ts
+++ b/apps/sim/triggers/webflow/form_submission.ts
@@ -76,9 +76,9 @@ export const webflowFormSubmissionTrigger: TriggerConfig = {
      type: 'string',
      description: 'The site ID where the form was submitted',
    },
-    formId: {
+    workspaceId: {
      type: 'string',
-      description: 'The form ID',
+      description: 'The workspace ID where the event occurred',
    },
    name: {
      type: 'string',
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
  "lockfileVersion": 1,
+  "configVersion": 0,
  "workspaces": {
    "": {
      "name": "simstudio",
Author	SHA1	Message	Date
Waleed	5e8c843241	v0.5.59: a2a support, documentation	2026-01-13 13:21:21 -08:00
Waleed	7bf3d73ee6	v0.5.58: export folders, new tools, permissions groups enhancements	2026-01-13 00:56:59 -08:00
Vikhyath Mondreti	7ffc11a738	v0.5.57: subagents, context menu improvements, bug fixes	2026-01-11 11:38:40 -08:00
Waleed	be578e2ed7	v0.5.56: batch operations, access control and permission groups, billing fixes	2026-01-10 00:31:34 -08:00
Waleed	f415e5edc4	v0.5.55: polling groups, bedrock provider, devcontainer fixes, workflow preview enhancements	2026-01-08 23:36:56 -08:00
Waleed	13a6e6c3fa	v0.5.54: seo, model blacklist, helm chart updates, fireflies integration, autoconnect improvements, billing fixes	2026-01-07 16:09:45 -08:00
Waleed	f5ab7f21ae	v0.5.53: hotkey improvements, added redis fallback, fixes for workflow tool	2026-01-06 23:34:52 -08:00
Waleed	bfb6fffe38	v0.5.52: new port-based router block, combobox expression and variable support	2026-01-06 16:14:10 -08:00
Waleed	4fbec0a43f	v0.5.51: triggers, kb, condition block improvements, supabase and grain integration updates	2026-01-06 14:26:46 -08:00
Waleed	585f5e365b	v0.5.50: import improvements, ui upgrades, kb styling and performance improvements	2026-01-05 00:35:55 -08:00
Waleed	3792bdd252	v0.5.49: hitl improvements, new email styles, imap trigger, logs context menu (#2672 ) * feat(logs-context-menu): consolidated logs utils and types, added logs record context menu (#2659) * feat(email): welcome email; improvement(emails): ui/ux (#2658) * feat(email): welcome email; improvement(emails): ui/ux * improvement(emails): links, accounts, preview * refactor(emails): file structure and wrapper components * added envvar for personal emails sent, added isHosted gate * fixed failing tests, added env mock * fix: removed comment --------- Co-authored-by: waleed <walif6@gmail.com> * fix(logging): hitl + trigger dev crash protection (#2664) * hitl gaps * deal with trigger worker crashes * cleanup import strcuture * feat(imap): added support for imap trigger (#2663) * feat(tools): added support for imap trigger * feat(imap): added parity, tested * ack PR comments * final cleanup * feat(i18n): update translations (#2665) Co-authored-by: waleedlatif1 <waleedlatif1@users.noreply.github.com> * fix(grain): updated grain trigger to auto-establish trigger (#2666) Co-authored-by: aadamgough <adam@sim.ai> * feat(admin): routes to manage deployments (#2667) * feat(admin): routes to manage deployments * fix naming fo deployed by * feat(time-picker): added timepicker emcn component, added to playground, added searchable prop for dropdown, added more timezones for schedule, updated license and notice date (#2668) * feat(time-picker): added timepicker emcn component, added to playground, added searchable prop for dropdown, added more timezones for schedule, updated license and notice date * removed unused params, cleaned up redundant utils * improvement(invite): aligned styling (#2669) * improvement(invite): aligned with rest of app * fix(invite): error handling * fix: addressed comments --------- Co-authored-by: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com> Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com> Co-authored-by: waleedlatif1 <waleedlatif1@users.noreply.github.com> Co-authored-by: Adam Gough <77861281+aadamgough@users.noreply.github.com> Co-authored-by: aadamgough <adam@sim.ai>	2026-01-03 13:19:18 -08:00
Waleed	eb5d1f3e5b	v0.5.48: copy-paste workflow blocks, docs updates, mcp tool fixes	2025-12-31 18:00:04 -08:00
Waleed	54ab82c8dd	v0.5.47: deploy workflow as mcp, kb chunks tokenizer, UI improvements, jira service management tools	2025-12-30 23:18:58 -08:00
Waleed	f895bf469b	v0.5.46: build improvements, greptile, light mode improvements	2025-12-29 02:17:52 -08:00
Waleed	dd3209af06	v0.5.45: light mode fixes, realtime usage indicator, docker build improvements	2025-12-27 19:57:42 -08:00
Waleed	b6ba3b50a7	v0.5.44: keyboard shortcuts, autolayout, light mode, byok, testing improvements	2025-12-26 21:25:19 -08:00
Waleed	b304233062	v0.5.43: export logs, circleback, grain, vertex, code hygiene, schedule improvements	2025-12-23 19:19:18 -08:00
Vikhyath Mondreti	57e4b49bd6	v0.5.42: fix memory migration	2025-12-23 01:24:54 -08:00
Vikhyath Mondreti	e12dd204ed	v0.5.41: memory fixes, copilot improvements, knowledgebase improvements, LLM providers standardization	2025-12-23 00:15:18 -08:00
Vikhyath Mondreti	3d9d9cbc54	v0.5.40: supabase ops to allow non-public schemas, jira uuid	2025-12-21 22:28:05 -08:00
Waleed	0f4ec962ad	v0.5.39: notion, workflow variables fixes	2025-12-20 20:44:00 -08:00
Waleed	4827866f9a	v0.5.38: snap to grid, copilot ux improvements, billing line items	2025-12-20 17:24:38 -08:00
Waleed	3e697d9ed9	v0.5.37: redaction utils consolidation, logs updates, autoconnect improvements, additional kb tag types	2025-12-19 22:31:55 -08:00
Martin Yankov	4431a1a484	fix(helm): add custom egress rules to realtime network policy (#2481 ) The realtime service network policy was missing the custom egress rules section that allows configuration of additional egress rules via values.yaml. This caused the realtime pods to be unable to connect to external databases (e.g., PostgreSQL on port 5432) when using external database configurations. The app network policy already had this section, but the realtime network policy was missing it, creating an inconsistency and preventing the realtime service from accessing external databases configured via networkPolicy.egress values. This fix adds the same custom egress rules template section to the realtime network policy, matching the app network policy behavior and allowing users to configure database connectivity via values.yaml.	2025-12-19 18:59:08 -08:00
Waleed	4d1a9a3f22	v0.5.36: hitl improvements, opengraph, slack fixes, one-click unsubscribe, auth checks, new db indexes	2025-12-19 01:27:49 -08:00
Vikhyath Mondreti	eb07a080fb	v0.5.35: helm updates, copilot improvements, 404 for docs, salesforce fixes, subflow resize clamping	2025-12-18 16:23:19 -08:00