use ipaddr

fix tests
remove proxy routes
2026-01-20 20:38:16 -05:00 · 2026-01-20 17:37:57 -08:00 · 2026-01-20 17:28:54 -08:00 · 2026-01-20 17:18:58 -08:00 · 2026-01-20 16:44:33 -08:00 · 2026-01-20 16:34:19 -08:00
173 changed files with 2559 additions and 3251 deletions
--- a/.claude/rules/emcn-components.md
+++ b/.claude/rules/emcn-components.md
@@ -1,35 +0,0 @@
---
-paths:
-  - "apps/sim/components/emcn/**"
---
-
-# EMCN Components
-
-Import from `@/components/emcn`, never from subpaths (except CSS files).
-
-## CVA vs Direct Styles
-
-**Use CVA when:** 2+ variants (primary/secondary, sm/md/lg)
-
-```tsx
-const buttonVariants = cva('base-classes', {
-  variants: { variant: { default: '...', primary: '...' } }
-})
-export { Button, buttonVariants }
-```
-
-**Use direct className when:** Single consistent style, no variations
-
-```tsx
-function Label({ className, ...props }) {
-  return <Primitive className={cn('style-classes', className)} {...props} />
-}
-```
-
-## Rules
-
- Use Radix UI primitives for accessibility
- Export component and variants (if using CVA)
- TSDoc with usage examples
- Consistent tokens: `font-medium`, `text-[12px]`, `rounded-[4px]`
- `transition-colors` for hover states
--- a/.claude/rules/global.md
+++ b/.claude/rules/global.md
@@ -1,13 +0,0 @@
-# Global Standards
-
-## Logging
-Import `createLogger` from `sim/logger`. Use `logger.info`, `logger.warn`, `logger.error` instead of `console.log`.
-
-## Comments
-Use TSDoc for documentation. No `====` separators. No non-TSDoc comments.
-
-## Styling
-Never update global styles. Keep all styling local to components.
-
-## Package Manager
-Use `bun` and `bunx`, not `npm` and `npx`.
--- a/.claude/rules/sim-architecture.md
+++ b/.claude/rules/sim-architecture.md
@@ -1,56 +0,0 @@
---
-paths:
-  - "apps/sim/**"
---
-
-# Sim App Architecture
-
-## Core Principles
-1. **Single Responsibility**: Each component, hook, store has one clear purpose
-2. **Composition Over Complexity**: Break down complex logic into smaller pieces
-3. **Type Safety First**: TypeScript interfaces for all props, state, return types
-4. **Predictable State**: Zustand for global state, useState for UI-only concerns
-
-## Root-Level Structure
-
-```
-apps/sim/
-├── app/                 # Next.js app router (pages, API routes)
-├── blocks/              # Block definitions and registry
-├── components/          # Shared UI (emcn/, ui/)
-├── executor/            # Workflow execution engine
-├── hooks/               # Shared hooks (queries/, selectors/)
-├── lib/                 # App-wide utilities
-├── providers/           # LLM provider integrations
-├── stores/              # Zustand stores
-├── tools/               # Tool definitions
-└── triggers/            # Trigger definitions
-```
-
-## Feature Organization
-
-Features live under `app/workspace/[workspaceId]/`:
-
-```
-feature/
-├── components/          # Feature components
-├── hooks/               # Feature-scoped hooks
-├── utils/               # Feature-scoped utilities (2+ consumers)
-├── feature.tsx          # Main component
-└── page.tsx             # Next.js page entry
-```
-
-## Naming Conventions
- **Components**: PascalCase (`WorkflowList`)
- **Hooks**: `use` prefix (`useWorkflowOperations`)
- **Files**: kebab-case (`workflow-list.tsx`)
- **Stores**: `stores/feature/store.ts`
- **Constants**: SCREAMING_SNAKE_CASE
- **Interfaces**: PascalCase with suffix (`WorkflowListProps`)
-
-## Utils Rules
-
- **Never create `utils.ts` for single consumer** - inline it
- **Create `utils.ts` when** 2+ files need the same helper
- **Check existing sources** before duplicating (`lib/` has many utilities)
- **Location**: `lib/` (app-wide) → `feature/utils/` (feature-scoped) → inline (single-use)
--- a/.claude/rules/sim-components.md
+++ b/.claude/rules/sim-components.md
@@ -1,48 +0,0 @@
---
-paths:
-  - "apps/sim/**/*.tsx"
---
-
-# Component Patterns
-
-## Structure Order
-
-```typescript
-'use client' // Only if using hooks
-
-// Imports (external → internal)
-// Constants at module level
-const CONFIG = { SPACING: 8 } as const
-
-// Props interface
-interface ComponentProps {
-  requiredProp: string
-  optionalProp?: boolean
-}
-
-export function Component({ requiredProp, optionalProp = false }: ComponentProps) {
-  // a. Refs
-  // b. External hooks (useParams, useRouter)
-  // c. Store hooks
-  // d. Custom hooks
-  // e. Local state
-  // f. useMemo
-  // g. useCallback
-  // h. useEffect
-  // i. Return JSX
-}
-```
-
-## Rules
-
-1. `'use client'` only when using React hooks
-2. Always define props interface
-3. Extract constants with `as const`
-4. Semantic HTML (`aside`, `nav`, `article`)
-5. Optional chain callbacks: `onAction?.(id)`
-
-## Component Extraction
-
-**Extract when:** 50+ lines, used in 2+ files, or has own state/logic
-
-**Keep inline when:** < 10 lines, single use, purely presentational
--- a/.claude/rules/sim-hooks.md
+++ b/.claude/rules/sim-hooks.md
@@ -1,55 +0,0 @@
---
-paths:
-  - "apps/sim/**/use-*.ts"
-  - "apps/sim/**/hooks/**/*.ts"
---
-
-# Hook Patterns
-
-## Structure
-
-```typescript
-interface UseFeatureProps {
-  id: string
-  onSuccess?: (result: Result) => void
-}
-
-export function useFeature({ id, onSuccess }: UseFeatureProps) {
-  // 1. Refs for stable dependencies
-  const idRef = useRef(id)
-  const onSuccessRef = useRef(onSuccess)
-
-  // 2. State
-  const [data, setData] = useState<Data | null>(null)
-  const [isLoading, setIsLoading] = useState(false)
-
-  // 3. Sync refs
-  useEffect(() => {
-    idRef.current = id
-    onSuccessRef.current = onSuccess
-  }, [id, onSuccess])
-
-  // 4. Operations (useCallback with empty deps when using refs)
-  const fetchData = useCallback(async () => {
-    setIsLoading(true)
-    try {
-      const result = await fetch(`/api/${idRef.current}`).then(r => r.json())
-      setData(result)
-      onSuccessRef.current?.(result)
-    } finally {
-      setIsLoading(false)
-    }
-  }, [])
-
-  return { data, isLoading, fetchData }
-}
-```
-
-## Rules
-
-1. Single responsibility per hook
-2. Props interface required
-3. Refs for stable callback dependencies
-4. Wrap returned functions in useCallback
-5. Always try/catch async operations
-6. Track loading/error states
--- a/.claude/rules/sim-imports.md
+++ b/.claude/rules/sim-imports.md
@@ -1,62 +0,0 @@
---
-paths:
-  - "apps/sim/**/*.ts"
-  - "apps/sim/**/*.tsx"
---
-
-# Import Patterns
-
-## Absolute Imports
-
-**Always use absolute imports.** Never use relative imports.
-
-```typescript
-// ✓ Good
-import { useWorkflowStore } from '@/stores/workflows/store'
-import { Button } from '@/components/ui/button'
-
-// ✗ Bad
-import { useWorkflowStore } from '../../../stores/workflows/store'
-```
-
-## Barrel Exports
-
-Use barrel exports (`index.ts`) when a folder has 3+ exports. Import from barrel, not individual files.
-
-```typescript
-// ✓ Good
-import { Dashboard, Sidebar } from '@/app/workspace/[workspaceId]/logs/components'
-
-// ✗ Bad
-import { Dashboard } from '@/app/workspace/[workspaceId]/logs/components/dashboard/dashboard'
-```
-
-## No Re-exports
-
-Do not re-export from non-barrel files. Import directly from the source.
-
-```typescript
-// ✓ Good - import from where it's declared
-import { CORE_TRIGGER_TYPES } from '@/stores/logs/filters/types'
-
-// ✗ Bad - re-exporting in utils.ts then importing from there
-import { CORE_TRIGGER_TYPES } from '@/app/workspace/.../utils'
-```
-
-## Import Order
-
-1. React/core libraries
-2. External libraries
-3. UI components (`@/components/emcn`, `@/components/ui`)
-4. Utilities (`@/lib/...`)
-5. Stores (`@/stores/...`)
-6. Feature imports
-7. CSS imports
-
-## Type Imports
-
-Use `type` keyword for type-only imports:
-
-```typescript
-import type { WorkflowLog } from '@/stores/logs/types'
-```
--- a/.claude/rules/sim-integrations.md
+++ b/.claude/rules/sim-integrations.md
@@ -1,209 +0,0 @@
---
-paths:
-  - "apps/sim/tools/**"
-  - "apps/sim/blocks/**"
-  - "apps/sim/triggers/**"
---
-
-# Adding Integrations
-
-## Overview
-
-Adding a new integration typically requires:
-1. **Tools** - API operations (`tools/{service}/`)
-2. **Block** - UI component (`blocks/blocks/{service}.ts`)
-3. **Icon** - SVG icon (`components/icons.tsx`)
-4. **Trigger** (optional) - Webhooks/polling (`triggers/{service}/`)
-
-Always look up the service's API docs first.
-
-## 1. Tools (`tools/{service}/`)
-
-```
-tools/{service}/
-├── index.ts           # Export all tools
-├── types.ts           # Params/response types
-├── {action}.ts        # Individual tool (e.g., send_message.ts)
-└── ...
-```
-
-**Tool file structure:**
-
-```typescript
-// tools/{service}/{action}.ts
-import type { {Service}Params, {Service}Response } from '@/tools/{service}/types'
-import type { ToolConfig } from '@/tools/types'
-
-export const {service}{Action}Tool: ToolConfig<{Service}Params, {Service}Response> = {
-  id: '{service}_{action}',
-  name: '{Service} {Action}',
-  description: 'What this tool does',
-  version: '1.0.0',
-  oauth: { required: true, provider: '{service}' }, // if OAuth
-  params: { /* param definitions */ },
-  request: {
-    url: '/api/tools/{service}/{action}',
-    method: 'POST',
-    headers: () => ({ 'Content-Type': 'application/json' }),
-    body: (params) => ({ ...params }),
-  },
-  transformResponse: async (response) => {
-    const data = await response.json()
-    if (!data.success) throw new Error(data.error)
-    return { success: true, output: data.output }
-  },
-  outputs: { /* output definitions */ },
-}
-```
-
-**Register in `tools/registry.ts`:**
-
-```typescript
-import { {service}{Action}Tool } from '@/tools/{service}'
-// Add to registry object
-{service}_{action}: {service}{Action}Tool,
-```
-
-## 2. Block (`blocks/blocks/{service}.ts`)
-
-```typescript
-import { {Service}Icon } from '@/components/icons'
-import type { BlockConfig } from '@/blocks/types'
-import type { {Service}Response } from '@/tools/{service}/types'
-
-export const {Service}Block: BlockConfig<{Service}Response> = {
-  type: '{service}',
-  name: '{Service}',
-  description: 'Short description',
-  longDescription: 'Detailed description',
-  category: 'tools',
-  bgColor: '#hexcolor',
-  icon: {Service}Icon,
-  subBlocks: [ /* see SubBlock Properties below */ ],
-  tools: {
-    access: ['{service}_{action}', ...],
-    config: {
-      tool: (params) => `{service}_${params.operation}`,
-      params: (params) => ({ ...params }),
-    },
-  },
-  inputs: { /* input definitions */ },
-  outputs: { /* output definitions */ },
-}
-```
-
-### SubBlock Properties
-
-```typescript
-{
-  id: 'fieldName',           // Unique identifier
-  title: 'Field Label',      // UI label
-  type: 'short-input',       // See SubBlock Types below
-  placeholder: 'Hint text',
-  required: true,            // See Required below
-  condition: { ... },        // See Condition below
-  dependsOn: ['otherField'], // See DependsOn below
-  mode: 'basic',             // 'basic' | 'advanced' | 'both' | 'trigger'
-}
-```
-
-**SubBlock Types:** `short-input`, `long-input`, `dropdown`, `code`, `switch`, `slider`, `oauth-input`, `channel-selector`, `user-selector`, `file-upload`, etc.
-
-### `condition` - Show/hide based on another field
-
-```typescript
-// Show when operation === 'send'
-condition: { field: 'operation', value: 'send' }
-
-// Show when operation is 'send' OR 'read'
-condition: { field: 'operation', value: ['send', 'read'] }
-
-// Show when operation !== 'send'
-condition: { field: 'operation', value: 'send', not: true }
-
-// Complex: NOT in list AND another condition
-condition: {
-  field: 'operation',
-  value: ['list_channels', 'list_users'],
-  not: true,
-  and: { field: 'destinationType', value: 'dm', not: true }
-}
-```
-
-### `required` - Field validation
-
-```typescript
-// Always required
-required: true
-
-// Conditionally required (same syntax as condition)
-required: { field: 'operation', value: 'send' }
-```
-
-### `dependsOn` - Clear field when dependencies change
-
-```typescript
-// Clear when credential changes
-dependsOn: ['credential']
-
-// Clear when authMethod changes AND (credential OR botToken) changes
-dependsOn: { all: ['authMethod'], any: ['credential', 'botToken'] }
-```
-
-### `mode` - When to show field
-
- `'basic'` - Only in basic mode (default UI)
- `'advanced'` - Only in advanced mode (manual input)
- `'both'` - Show in both modes (default)
- `'trigger'` - Only when block is used as trigger
-
-**Register in `blocks/registry.ts`:**
-
-```typescript
-import { {Service}Block } from '@/blocks/blocks/{service}'
-// Add to registry object (alphabetically)
-{service}: {Service}Block,
-```
-
-## 3. Icon (`components/icons.tsx`)
-
-```typescript
-export function {Service}Icon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg {...props} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-      {/* SVG path from service's brand assets */}
-    </svg>
-  )
-}
-```
-
-## 4. Trigger (`triggers/{service}/`) - Optional
-
-```
-triggers/{service}/
-├── index.ts           # Export all triggers
-├── webhook.ts         # Webhook handler
-├── utils.ts           # Shared utilities
-└── {event}.ts         # Specific event handlers
-```
-
-**Register in `triggers/registry.ts`:**
-
-```typescript
-import { {service}WebhookTrigger } from '@/triggers/{service}'
-// Add to TRIGGER_REGISTRY
-{service}_webhook: {service}WebhookTrigger,
-```
-
-## Checklist
-
- [ ] Look up API docs for the service
- [ ] Create `tools/{service}/types.ts` with proper types
- [ ] Create tool files for each operation
- [ ] Create `tools/{service}/index.ts` barrel export
- [ ] Register tools in `tools/registry.ts`
- [ ] Add icon to `components/icons.tsx`
- [ ] Create block in `blocks/blocks/{service}.ts`
- [ ] Register block in `blocks/registry.ts`
- [ ] (Optional) Create triggers in `triggers/{service}/`
- [ ] (Optional) Register triggers in `triggers/registry.ts`
--- a/.claude/rules/sim-queries.md
+++ b/.claude/rules/sim-queries.md
@@ -1,66 +0,0 @@
---
-paths:
-  - "apps/sim/hooks/queries/**/*.ts"
---
-
-# React Query Patterns
-
-All React Query hooks live in `hooks/queries/`.
-
-## Query Key Factory
-
-Every query file defines a keys factory:
-
-```typescript
-export const entityKeys = {
-  all: ['entity'] as const,
-  list: (workspaceId?: string) => [...entityKeys.all, 'list', workspaceId ?? ''] as const,
-  detail: (id?: string) => [...entityKeys.all, 'detail', id ?? ''] as const,
-}
-```
-
-## File Structure
-
-```typescript
-// 1. Query keys factory
-// 2. Types (if needed)
-// 3. Private fetch functions
-// 4. Exported hooks
-```
-
-## Query Hook
-
-```typescript
-export function useEntityList(workspaceId?: string, options?: { enabled?: boolean }) {
-  return useQuery({
-    queryKey: entityKeys.list(workspaceId),
-    queryFn: () => fetchEntities(workspaceId as string),
-    enabled: Boolean(workspaceId) && (options?.enabled ?? true),
-    staleTime: 60 * 1000,
-    placeholderData: keepPreviousData,
-  })
-}
-```
-
-## Mutation Hook
-
-```typescript
-export function useCreateEntity() {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: async (variables) => { /* fetch POST */ },
-    onSuccess: () => queryClient.invalidateQueries({ queryKey: entityKeys.all }),
-  })
-}
-```
-
-## Optimistic Updates
-
-For optimistic mutations syncing with Zustand, use `createOptimisticMutationHandlers` from `@/hooks/queries/utils/optimistic-mutation`.
-
-## Naming
-
- **Keys**: `entityKeys`
- **Query hooks**: `useEntity`, `useEntityList`
- **Mutation hooks**: `useCreateEntity`, `useUpdateEntity`
- **Fetch functions**: `fetchEntity` (private)
--- a/.claude/rules/sim-stores.md
+++ b/.claude/rules/sim-stores.md
@@ -1,71 +0,0 @@
---
-paths:
-  - "apps/sim/**/store.ts"
-  - "apps/sim/**/stores/**/*.ts"
---
-
-# Zustand Store Patterns
-
-Stores live in `stores/`. Complex stores split into `store.ts` + `types.ts`.
-
-## Basic Store
-
-```typescript
-import { create } from 'zustand'
-import { devtools } from 'zustand/middleware'
-import type { FeatureState } from '@/stores/feature/types'
-
-const initialState = { items: [] as Item[], activeId: null as string | null }
-
-export const useFeatureStore = create<FeatureState>()(
-  devtools(
-    (set, get) => ({
-      ...initialState,
-      setItems: (items) => set({ items }),
-      addItem: (item) => set((state) => ({ items: [...state.items, item] })),
-      reset: () => set(initialState),
-    }),
-    { name: 'feature-store' }
-  )
-)
-```
-
-## Persisted Store
-
-```typescript
-import { create } from 'zustand'
-import { persist } from 'zustand/middleware'
-
-export const useFeatureStore = create<FeatureState>()(
-  persist(
-    (set) => ({
-      width: 300,
-      setWidth: (width) => set({ width }),
-      _hasHydrated: false,
-      setHasHydrated: (v) => set({ _hasHydrated: v }),
-    }),
-    {
-      name: 'feature-state',
-      partialize: (state) => ({ width: state.width }),
-      onRehydrateStorage: () => (state) => state?.setHasHydrated(true),
-    }
-  )
-)
-```
-
-## Rules
-
-1. Use `devtools` middleware (named stores)
-2. Use `persist` only when data should survive reload
-3. `partialize` to persist only necessary state
-4. `_hasHydrated` pattern for persisted stores needing hydration tracking
-5. Immutable updates only
-6. `set((state) => ...)` when depending on previous state
-7. Provide `reset()` action
-
-## Outside React
-
-```typescript
-const items = useFeatureStore.getState().items
-useFeatureStore.setState({ items: newItems })
-```
--- a/.claude/rules/sim-styling.md
+++ b/.claude/rules/sim-styling.md
@@ -1,41 +0,0 @@
---
-paths:
-  - "apps/sim/**/*.tsx"
-  - "apps/sim/**/*.css"
---
-
-# Styling Rules
-
-## Tailwind
-
-1. **No inline styles** - Use Tailwind classes
-2. **No duplicate dark classes** - Skip `dark:` when value matches light mode
-3. **Exact values** - `text-[14px]`, `h-[26px]`
-4. **Transitions** - `transition-colors` for interactive states
-
-## Conditional Classes
-
-```typescript
-import { cn } from '@/lib/utils'
-
-<div className={cn(
-  'base-classes',
-  isActive && 'active-classes',
-  disabled ? 'opacity-60' : 'hover:bg-accent'
-)} />
-```
-
-## CSS Variables
-
-For dynamic values (widths, heights) synced with stores:
-
-```typescript
-// In store
-setWidth: (width) => {
-  set({ width })
-  document.documentElement.style.setProperty('--sidebar-width', `${width}px`)
-}
-
-// In component
-<aside style={{ width: 'var(--sidebar-width)' }} />
-```
--- a/.claude/rules/sim-testing.md
+++ b/.claude/rules/sim-testing.md
@@ -1,58 +0,0 @@
---
-paths:
-  - "apps/sim/**/*.test.ts"
-  - "apps/sim/**/*.test.tsx"
---
-
-# Testing Patterns
-
-Use Vitest. Test files: `feature.ts` → `feature.test.ts`
-
-## Structure
-
-```typescript
-/**
- * @vitest-environment node
- */
-import { databaseMock, loggerMock } from '@sim/testing'
-import { describe, expect, it, vi } from 'vitest'
-
-vi.mock('@sim/db', () => databaseMock)
-vi.mock('@sim/logger', () => loggerMock)
-
-import { myFunction } from '@/lib/feature'
-
-describe('myFunction', () => {
-  beforeEach(() => vi.clearAllMocks())
-  it.concurrent('isolated tests run in parallel', () => { ... })
-})
-```
-
-## @sim/testing Package
-
-Always prefer over local mocks.
-
-| Category | Utilities |
-|----------|-----------|
-| **Mocks** | `loggerMock`, `databaseMock`, `setupGlobalFetchMock()` |
-| **Factories** | `createSession()`, `createWorkflowRecord()`, `createBlock()`, `createExecutorContext()` |
-| **Builders** | `WorkflowBuilder`, `ExecutionContextBuilder` |
-| **Assertions** | `expectWorkflowAccessGranted()`, `expectBlockExecuted()` |
-
-## Rules
-
-1. `@vitest-environment node` directive at file top
-2. `vi.mock()` calls before importing mocked modules
-3. `@sim/testing` utilities over local mocks
-4. `it.concurrent` for isolated tests (no shared mutable state)
-5. `beforeEach(() => vi.clearAllMocks())` to reset state
-
-## Hoisted Mocks
-
-For mutable mock references:
-
-```typescript
-const mockFn = vi.hoisted(() => vi.fn())
-vi.mock('@/lib/module', () => ({ myFunction: mockFn }))
-mockFn.mockResolvedValue({ data: 'test' })
-```
--- a/.claude/rules/sim-typescript.md
+++ b/.claude/rules/sim-typescript.md
@@ -1,21 +0,0 @@
---
-paths:
-  - "apps/sim/**/*.ts"
-  - "apps/sim/**/*.tsx"
---
-
-# TypeScript Rules
-
-1. **No `any`** - Use proper types or `unknown` with type guards
-2. **Props interface** - Always define for components
-3. **Const assertions** - `as const` for constant objects/arrays
-4. **Ref types** - Explicit: `useRef<HTMLDivElement>(null)`
-5. **Type imports** - `import type { X }` for type-only imports
-
-```typescript
-// ✗ Bad
-const handleClick = (e: any) => {}
-
-// ✓ Good
-const handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {}
-```
--- a/.cursor/rules/global.mdc
+++ b/.cursor/rules/global.mdc
@@ -8,7 +8,7 @@ alwaysApply: true
 You are a professional software engineer. All code must follow best practices: accurate, readable, clean, and efficient.

 ## Logging
-Import `createLogger` from `@sim/logger`. Use `logger.info`, `logger.warn`, `logger.error` instead of `console.log`.
+Import `createLogger` from `sim/logger`. Use `logger.info`, `logger.warn`, `logger.error` instead of `console.log`.

 ## Comments
 Use TSDoc for documentation. No `====` separators. No non-TSDoc comments.
--- a/apps/sim/app/api/auth/sso/providers/route.ts
+++ b/apps/sim/app/api/auth/sso/providers/route.ts
@@ -4,7 +4,7 @@ import { eq } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'

-const logger = createLogger('SSOProvidersRoute')
+const logger = createLogger('SSO-Providers')

 export async function GET() {
  try {
--- a/apps/sim/app/api/auth/sso/register/route.ts
+++ b/apps/sim/app/api/auth/sso/register/route.ts
@@ -6,7 +6,7 @@ import { hasSSOAccess } from '@/lib/billing'
 import { env } from '@/lib/core/config/env'
 import { REDACTED_MARKER } from '@/lib/core/security/redaction'

-const logger = createLogger('SSORegisterRoute')
+const logger = createLogger('SSO-Register')

 const mappingSchema = z
  .object({
@@ -43,10 +43,6 @@ const ssoRegistrationSchema = z.discriminatedUnion('providerType', [
      ])
      .default(['openid', 'profile', 'email']),
    pkce: z.boolean().default(true),
-    authorizationEndpoint: z.string().url().optional(),
-    tokenEndpoint: z.string().url().optional(),
-    userInfoEndpoint: z.string().url().optional(),
-    jwksEndpoint: z.string().url().optional(),
  }),
  z.object({
    providerType: z.literal('saml'),
@@ -68,10 +64,12 @@ const ssoRegistrationSchema = z.discriminatedUnion('providerType', [

 export async function POST(request: NextRequest) {
  try {
+    // SSO plugin must be enabled in Better Auth
    if (!env.SSO_ENABLED) {
      return NextResponse.json({ error: 'SSO is not enabled' }, { status: 400 })
    }

+    // Check plan access (enterprise) or env var override
    const session = await getSession()
    if (!session?.user?.id) {
      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
@@ -118,16 +116,7 @@ export async function POST(request: NextRequest) {
    }

    if (providerType === 'oidc') {
-      const {
-        clientId,
-        clientSecret,
-        scopes,
-        pkce,
-        authorizationEndpoint,
-        tokenEndpoint,
-        userInfoEndpoint,
-        jwksEndpoint,
-      } = body
+      const { clientId, clientSecret, scopes, pkce } = body

      const oidcConfig: any = {
        clientId,
@@ -138,102 +127,48 @@ export async function POST(request: NextRequest) {
        pkce: pkce ?? true,
      }

-      oidcConfig.authorizationEndpoint = authorizationEndpoint
-      oidcConfig.tokenEndpoint = tokenEndpoint
-      oidcConfig.userInfoEndpoint = userInfoEndpoint
-      oidcConfig.jwksEndpoint = jwksEndpoint
-
-      const needsDiscovery =
-        !oidcConfig.authorizationEndpoint || !oidcConfig.tokenEndpoint || !oidcConfig.jwksEndpoint
-
-      if (needsDiscovery) {
-        const discoveryUrl = `${issuer.replace(/\/$/, '')}/.well-known/openid-configuration`
-        try {
-          logger.info('Fetching OIDC discovery document for missing endpoints', {
-            discoveryUrl,
-            hasAuthEndpoint: !!oidcConfig.authorizationEndpoint,
-            hasTokenEndpoint: !!oidcConfig.tokenEndpoint,
-            hasJwksEndpoint: !!oidcConfig.jwksEndpoint,
-          })
-
-          const discoveryResponse = await fetch(discoveryUrl, {
-            headers: { Accept: 'application/json' },
-          })
-
-          if (!discoveryResponse.ok) {
-            logger.error('Failed to fetch OIDC discovery document', {
-              status: discoveryResponse.status,
-              statusText: discoveryResponse.statusText,
-            })
-            return NextResponse.json(
-              {
-                error: `Failed to fetch OIDC discovery document from ${discoveryUrl}. Status: ${discoveryResponse.status}. Provide all endpoints explicitly or verify the issuer URL.`,
-              },
-              { status: 400 }
-            )
-          }
-
-          const discovery = await discoveryResponse.json()
-
-          oidcConfig.authorizationEndpoint =
-            oidcConfig.authorizationEndpoint || discovery.authorization_endpoint
-          oidcConfig.tokenEndpoint = oidcConfig.tokenEndpoint || discovery.token_endpoint
-          oidcConfig.userInfoEndpoint = oidcConfig.userInfoEndpoint || discovery.userinfo_endpoint
-          oidcConfig.jwksEndpoint = oidcConfig.jwksEndpoint || discovery.jwks_uri
-
-          logger.info('Merged OIDC endpoints (user-provided + discovery)', {
-            providerId,
-            issuer,
-            authorizationEndpoint: oidcConfig.authorizationEndpoint,
-            tokenEndpoint: oidcConfig.tokenEndpoint,
-            userInfoEndpoint: oidcConfig.userInfoEndpoint,
-            jwksEndpoint: oidcConfig.jwksEndpoint,
-          })
-        } catch (error) {
-          logger.error('Error fetching OIDC discovery document', {
-            error: error instanceof Error ? error.message : 'Unknown error',
-            discoveryUrl,
-          })
-          return NextResponse.json(
-            {
-              error: `Failed to fetch OIDC discovery document from ${discoveryUrl}. Please verify the issuer URL is correct or provide all endpoints explicitly.`,
-            },
-            { status: 400 }
-          )
-        }
-      } else {
-        logger.info('Using explicitly provided OIDC endpoints (all present)', {
-          providerId,
-          issuer,
-          authorizationEndpoint: oidcConfig.authorizationEndpoint,
-          tokenEndpoint: oidcConfig.tokenEndpoint,
-          userInfoEndpoint: oidcConfig.userInfoEndpoint,
-          jwksEndpoint: oidcConfig.jwksEndpoint,
-        })
-      }
-
+      // Add manual endpoints for providers that might need them
+      // Common patterns for OIDC providers that don't support discovery properly
      if (
-        !oidcConfig.authorizationEndpoint ||
-        !oidcConfig.tokenEndpoint ||
-        !oidcConfig.jwksEndpoint
+        issuer.includes('okta.com') ||
+        issuer.includes('auth0.com') ||
+        issuer.includes('identityserver')
      ) {
-        const missing: string[] = []
-        if (!oidcConfig.authorizationEndpoint) missing.push('authorizationEndpoint')
-        if (!oidcConfig.tokenEndpoint) missing.push('tokenEndpoint')
-        if (!oidcConfig.jwksEndpoint) missing.push('jwksEndpoint')
+        const baseUrl = issuer.includes('/oauth2/default')
+          ? issuer.replace('/oauth2/default', '')
+          : issuer.replace('/oauth', '').replace('/v2.0', '').replace('/oauth2', '')

-        logger.error('Missing required OIDC endpoints after discovery merge', {
-          missing,
-          authorizationEndpoint: oidcConfig.authorizationEndpoint,
-          tokenEndpoint: oidcConfig.tokenEndpoint,
-          jwksEndpoint: oidcConfig.jwksEndpoint,
+        // Okta-style endpoints
+        if (issuer.includes('okta.com')) {
+          oidcConfig.authorizationEndpoint = `${baseUrl}/oauth2/default/v1/authorize`
+          oidcConfig.tokenEndpoint = `${baseUrl}/oauth2/default/v1/token`
+          oidcConfig.userInfoEndpoint = `${baseUrl}/oauth2/default/v1/userinfo`
+          oidcConfig.jwksEndpoint = `${baseUrl}/oauth2/default/v1/keys`
+        }
+        // Auth0-style endpoints
+        else if (issuer.includes('auth0.com')) {
+          oidcConfig.authorizationEndpoint = `${baseUrl}/authorize`
+          oidcConfig.tokenEndpoint = `${baseUrl}/oauth/token`
+          oidcConfig.userInfoEndpoint = `${baseUrl}/userinfo`
+          oidcConfig.jwksEndpoint = `${baseUrl}/.well-known/jwks.json`
+        }
+        // Generic OIDC endpoints (IdentityServer, etc.)
+        else {
+          oidcConfig.authorizationEndpoint = `${baseUrl}/connect/authorize`
+          oidcConfig.tokenEndpoint = `${baseUrl}/connect/token`
+          oidcConfig.userInfoEndpoint = `${baseUrl}/connect/userinfo`
+          oidcConfig.jwksEndpoint = `${baseUrl}/.well-known/jwks`
+        }
+
+        logger.info('Using manual OIDC endpoints for provider', {
+          providerId,
+          provider: issuer.includes('okta.com')
+            ? 'Okta'
+            : issuer.includes('auth0.com')
+              ? 'Auth0'
+              : 'Generic',
+          authEndpoint: oidcConfig.authorizationEndpoint,
        })
-        return NextResponse.json(
-          {
-            error: `Missing required OIDC endpoints: ${missing.join(', ')}. Please provide these explicitly or verify the issuer supports OIDC discovery.`,
-          },
-          { status: 400 }
-        )
      }

      providerConfig.oidcConfig = oidcConfig
--- a/apps/sim/app/api/copilot/execute-tool/route.ts
+++ b/apps/sim/app/api/copilot/execute-tool/route.ts
@@ -224,7 +224,7 @@ export async function POST(req: NextRequest) {
      hasApiKey: !!executionParams.apiKey,
    })

-    const result = await executeTool(resolvedToolName, executionParams, true)
+    const result = await executeTool(resolvedToolName, executionParams)

    logger.info(`[${tracker.requestId}] Tool execution complete`, {
      toolName,
--- a/apps/sim/app/api/files/parse/route.ts
+++ b/apps/sim/app/api/files/parse/route.ts
@@ -6,9 +6,10 @@ import { createLogger } from '@sim/logger'
 import binaryExtensionsList from 'binary-extensions'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { createPinnedUrl, validateUrlWithDNS } from '@/lib/core/security/input-validation'
+import { secureFetchWithPinnedIP, validateUrlWithDNS } from '@/lib/core/security/input-validation'
 import { isSupportedFileType, parseFile } from '@/lib/file-parsers'
 import { isUsingCloudStorage, type StorageContext, StorageService } from '@/lib/uploads'
+import { uploadExecutionFile } from '@/lib/uploads/contexts/execution'
 import { UPLOAD_DIR_SERVER } from '@/lib/uploads/core/setup.server'
 import { getFileMetadataByKey } from '@/lib/uploads/server/metadata'
 import {
@@ -21,6 +22,7 @@ import {
 } from '@/lib/uploads/utils/file-utils'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import { verifyFileAccess } from '@/app/api/files/authorization'
+import type { UserFile } from '@/executor/types'
 import '@/lib/uploads/core/setup.server'

 export const dynamic = 'force-dynamic'
@@ -30,6 +32,12 @@ const logger = createLogger('FilesParseAPI')
 const MAX_DOWNLOAD_SIZE_BYTES = 100 * 1024 * 1024 // 100 MB
 const DOWNLOAD_TIMEOUT_MS = 30000 // 30 seconds

+interface ExecutionContext {
+  workspaceId: string
+  workflowId: string
+  executionId: string
+}
+
 interface ParseResult {
  success: boolean
  content?: string
@@ -37,6 +45,7 @@ interface ParseResult {
  filePath: string
  originalName?: string // Original filename from database (for workspace files)
  viewerUrl?: string | null // Viewer URL for the file if available
+  userFile?: UserFile // UserFile object for the raw file
  metadata?: {
    fileType: string
    size: number
@@ -70,27 +79,45 @@ export async function POST(request: NextRequest) {

    const userId = authResult.userId
    const requestData = await request.json()
-    const { filePath, fileType, workspaceId } = requestData
+    const { filePath, fileType, workspaceId, workflowId, executionId } = requestData

    if (!filePath || (typeof filePath === 'string' && filePath.trim() === '')) {
      return NextResponse.json({ success: false, error: 'No file path provided' }, { status: 400 })
    }

-    logger.info('File parse request received:', { filePath, fileType, workspaceId, userId })
+    // Build execution context if all required fields are present
+    const executionContext: ExecutionContext | undefined =
+      workspaceId && workflowId && executionId
+        ? { workspaceId, workflowId, executionId }
+        : undefined
+
+    logger.info('File parse request received:', {
+      filePath,
+      fileType,
+      workspaceId,
+      userId,
+      hasExecutionContext: !!executionContext,
+    })

    if (Array.isArray(filePath)) {
      const results = []
-      for (const path of filePath) {
-        if (!path || (typeof path === 'string' && path.trim() === '')) {
+      for (const singlePath of filePath) {
+        if (!singlePath || (typeof singlePath === 'string' && singlePath.trim() === '')) {
          results.push({
            success: false,
            error: 'Empty file path in array',
-            filePath: path || '',
+            filePath: singlePath || '',
          })
          continue
        }

-        const result = await parseFileSingle(path, fileType, workspaceId, userId)
+        const result = await parseFileSingle(
+          singlePath,
+          fileType,
+          workspaceId,
+          userId,
+          executionContext
+        )
        if (result.metadata) {
          result.metadata.processingTime = Date.now() - startTime
        }
@@ -106,6 +133,7 @@ export async function POST(request: NextRequest) {
              fileType: result.metadata?.fileType || 'application/octet-stream',
              size: result.metadata?.size || 0,
              binary: false,
+              file: result.userFile,
            },
            filePath: result.filePath,
            viewerUrl: result.viewerUrl,
@@ -121,7 +149,7 @@ export async function POST(request: NextRequest) {
      })
    }

-    const result = await parseFileSingle(filePath, fileType, workspaceId, userId)
+    const result = await parseFileSingle(filePath, fileType, workspaceId, userId, executionContext)

    if (result.metadata) {
      result.metadata.processingTime = Date.now() - startTime
@@ -137,6 +165,7 @@ export async function POST(request: NextRequest) {
          fileType: result.metadata?.fileType || 'application/octet-stream',
          size: result.metadata?.size || 0,
          binary: false,
+          file: result.userFile,
        },
        filePath: result.filePath,
        viewerUrl: result.viewerUrl,
@@ -164,7 +193,8 @@ async function parseFileSingle(
  filePath: string,
  fileType: string,
  workspaceId: string,
-  userId: string
+  userId: string,
+  executionContext?: ExecutionContext
 ): Promise<ParseResult> {
  logger.info('Parsing file:', filePath)

@@ -186,18 +216,18 @@ async function parseFileSingle(
  }

  if (filePath.includes('/api/files/serve/')) {
-    return handleCloudFile(filePath, fileType, undefined, userId)
+    return handleCloudFile(filePath, fileType, undefined, userId, executionContext)
  }

  if (filePath.startsWith('http://') || filePath.startsWith('https://')) {
-    return handleExternalUrl(filePath, fileType, workspaceId, userId)
+    return handleExternalUrl(filePath, fileType, workspaceId, userId, executionContext)
  }

  if (isUsingCloudStorage()) {
-    return handleCloudFile(filePath, fileType, undefined, userId)
+    return handleCloudFile(filePath, fileType, undefined, userId, executionContext)
  }

-  return handleLocalFile(filePath, fileType, userId)
+  return handleLocalFile(filePath, fileType, userId, executionContext)
 }

 /**
@@ -230,12 +260,14 @@ function validateFilePath(filePath: string): { isValid: boolean; error?: string
 /**
 * Handle external URL
 * If workspaceId is provided, checks if file already exists and saves to workspace if not
+ * If executionContext is provided, also stores the file in execution storage and returns UserFile
 */
 async function handleExternalUrl(
  url: string,
  fileType: string,
  workspaceId: string,
-  userId: string
+  userId: string,
+  executionContext?: ExecutionContext
 ): Promise<ParseResult> {
  try {
    logger.info('Fetching external URL:', url)
@@ -312,17 +344,13 @@ async function handleExternalUrl(

        if (existingFile) {
          const storageFilePath = `/api/files/serve/${existingFile.key}`
-          return handleCloudFile(storageFilePath, fileType, 'workspace', userId)
+          return handleCloudFile(storageFilePath, fileType, 'workspace', userId, executionContext)
        }
      }
    }

-    const pinnedUrl = createPinnedUrl(url, urlValidation.resolvedIP!)
-    const response = await fetch(pinnedUrl, {
-      signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS),
-      headers: {
-        Host: urlValidation.originalHostname!,
-      },
+    const response = await secureFetchWithPinnedIP(url, urlValidation.resolvedIP!, {
+      timeout: DOWNLOAD_TIMEOUT_MS,
    })
    if (!response.ok) {
      throw new Error(`Failed to fetch URL: ${response.status} ${response.statusText}`)
@@ -341,6 +369,19 @@ async function handleExternalUrl(

    logger.info(`Downloaded file from URL: ${url}, size: ${buffer.length} bytes`)

+    let userFile: UserFile | undefined
+    const mimeType = response.headers.get('content-type') || getMimeTypeFromExtension(extension)
+
+    if (executionContext) {
+      try {
+        userFile = await uploadExecutionFile(executionContext, buffer, filename, mimeType, userId)
+        logger.info(`Stored file in execution storage: ${filename}`, { key: userFile.key })
+      } catch (uploadError) {
+        logger.warn(`Failed to store file in execution storage:`, uploadError)
+        // Continue without userFile - parsing can still work
+      }
+    }
+
    if (shouldCheckWorkspace) {
      try {
        const permission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
@@ -353,8 +394,6 @@ async function handleExternalUrl(
          })
        } else {
          const { uploadWorkspaceFile } = await import('@/lib/uploads/contexts/workspace')
-          const mimeType =
-            response.headers.get('content-type') || getMimeTypeFromExtension(extension)
          await uploadWorkspaceFile(workspaceId, userId, buffer, filename, mimeType)
          logger.info(`Saved URL file to workspace storage: ${filename}`)
        }
@@ -363,17 +402,23 @@ async function handleExternalUrl(
      }
    }

+    let parseResult: ParseResult
    if (extension === 'pdf') {
-      return await handlePdfBuffer(buffer, filename, fileType, url)
-    }
-    if (extension === 'csv') {
-      return await handleCsvBuffer(buffer, filename, fileType, url)
-    }
-    if (isSupportedFileType(extension)) {
-      return await handleGenericTextBuffer(buffer, filename, extension, fileType, url)
+      parseResult = await handlePdfBuffer(buffer, filename, fileType, url)
+    } else if (extension === 'csv') {
+      parseResult = await handleCsvBuffer(buffer, filename, fileType, url)
+    } else if (isSupportedFileType(extension)) {
+      parseResult = await handleGenericTextBuffer(buffer, filename, extension, fileType, url)
+    } else {
+      parseResult = handleGenericBuffer(buffer, filename, extension, fileType)
    }

-    return handleGenericBuffer(buffer, filename, extension, fileType)
+    // Attach userFile to the result
+    if (userFile) {
+      parseResult.userFile = userFile
+    }
+
+    return parseResult
  } catch (error) {
    logger.error(`Error handling external URL ${url}:`, error)
    return {
@@ -386,12 +431,15 @@ async function handleExternalUrl(

 /**
 * Handle file stored in cloud storage
+ * If executionContext is provided and file is not already from execution storage,
+ * copies the file to execution storage and returns UserFile
 */
 async function handleCloudFile(
  filePath: string,
  fileType: string,
  explicitContext: string | undefined,
-  userId: string
+  userId: string,
+  executionContext?: ExecutionContext
 ): Promise<ParseResult> {
  try {
    const cloudKey = extractStorageKey(filePath)
@@ -438,6 +486,7 @@ async function handleCloudFile(

    const filename = originalFilename || cloudKey.split('/').pop() || cloudKey
    const extension = path.extname(filename).toLowerCase().substring(1)
+    const mimeType = getMimeTypeFromExtension(extension)

    const normalizedFilePath = `/api/files/serve/${encodeURIComponent(cloudKey)}?context=${context}`
    let workspaceIdFromKey: string | undefined
@@ -453,6 +502,39 @@ async function handleCloudFile(

    const viewerUrl = getViewerUrl(cloudKey, workspaceIdFromKey)

+    // Store file in execution storage if executionContext is provided
+    let userFile: UserFile | undefined
+
+    if (executionContext) {
+      // If file is already from execution context, create UserFile reference without re-uploading
+      if (context === 'execution') {
+        userFile = {
+          id: `file_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
+          name: filename,
+          url: normalizedFilePath,
+          size: fileBuffer.length,
+          type: mimeType,
+          key: cloudKey,
+          context: 'execution',
+        }
+        logger.info(`Created UserFile reference for existing execution file: ${filename}`)
+      } else {
+        // Copy from workspace/other storage to execution storage
+        try {
+          userFile = await uploadExecutionFile(
+            executionContext,
+            fileBuffer,
+            filename,
+            mimeType,
+            userId
+          )
+          logger.info(`Copied file to execution storage: ${filename}`, { key: userFile.key })
+        } catch (uploadError) {
+          logger.warn(`Failed to copy file to execution storage:`, uploadError)
+        }
+      }
+    }
+
    let parseResult: ParseResult
    if (extension === 'pdf') {
      parseResult = await handlePdfBuffer(fileBuffer, filename, fileType, normalizedFilePath)
@@ -477,6 +559,11 @@ async function handleCloudFile(

    parseResult.viewerUrl = viewerUrl

+    // Attach userFile to the result
+    if (userFile) {
+      parseResult.userFile = userFile
+    }
+
    return parseResult
  } catch (error) {
    logger.error(`Error handling cloud file ${filePath}:`, error)
@@ -500,7 +587,8 @@ async function handleCloudFile(
 async function handleLocalFile(
  filePath: string,
  fileType: string,
-  userId: string
+  userId: string,
+  executionContext?: ExecutionContext
 ): Promise<ParseResult> {
  try {
    const filename = filePath.split('/').pop() || filePath
@@ -540,13 +628,32 @@ async function handleLocalFile(
    const hash = createHash('md5').update(fileBuffer).digest('hex')

    const extension = path.extname(filename).toLowerCase().substring(1)
+    const mimeType = fileType || getMimeTypeFromExtension(extension)
+
+    // Store file in execution storage if executionContext is provided
+    let userFile: UserFile | undefined
+    if (executionContext) {
+      try {
+        userFile = await uploadExecutionFile(
+          executionContext,
+          fileBuffer,
+          filename,
+          mimeType,
+          userId
+        )
+        logger.info(`Stored local file in execution storage: ${filename}`, { key: userFile.key })
+      } catch (uploadError) {
+        logger.warn(`Failed to store local file in execution storage:`, uploadError)
+      }
+    }

    return {
      success: true,
      content: result.content,
      filePath,
+      userFile,
      metadata: {
-        fileType: fileType || getMimeTypeFromExtension(extension),
+        fileType: mimeType,
        size: stats.size,
        hash,
        processingTime: 0,
--- a/apps/sim/app/api/proxy/route.ts
+++ b/apps/sim/app/api/proxy/route.ts
@@ -1,395 +0,0 @@
-import { createLogger } from '@sim/logger'
-import type { NextRequest } from 'next/server'
-import { NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { generateInternalToken } from '@/lib/auth/internal'
-import { isDev } from '@/lib/core/config/feature-flags'
-import { createPinnedUrl, validateUrlWithDNS } from '@/lib/core/security/input-validation'
-import { generateRequestId } from '@/lib/core/utils/request'
-import { getBaseUrl } from '@/lib/core/utils/urls'
-import { executeTool } from '@/tools'
-import { getTool, validateRequiredParametersAfterMerge } from '@/tools/utils'
-
-const logger = createLogger('ProxyAPI')
-
-const proxyPostSchema = z.object({
-  toolId: z.string().min(1, 'toolId is required'),
-  params: z.record(z.any()).optional().default({}),
-  executionContext: z
-    .object({
-      workflowId: z.string().optional(),
-      workspaceId: z.string().optional(),
-      executionId: z.string().optional(),
-      userId: z.string().optional(),
-    })
-    .optional(),
-})
-
-/**
- * Creates a minimal set of default headers for proxy requests
- * @returns Record of HTTP headers
- */
-const getProxyHeaders = (): Record<string, string> => {
-  return {
-    'User-Agent':
-      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36',
-    Accept: '*/*',
-    'Accept-Encoding': 'gzip, deflate, br',
-    'Cache-Control': 'no-cache',
-    Connection: 'keep-alive',
-  }
-}
-
-/**
- * Formats a response with CORS headers
- * @param responseData Response data object
- * @param status HTTP status code
- * @returns NextResponse with CORS headers
- */
-const formatResponse = (responseData: any, status = 200) => {
-  return NextResponse.json(responseData, {
-    status,
-    headers: {
-      'Access-Control-Allow-Origin': '*',
-      'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
-      'Access-Control-Allow-Headers': 'Content-Type, Authorization',
-    },
-  })
-}
-
-/**
- * Creates an error response with consistent formatting
- * @param error Error object or message
- * @param status HTTP status code
- * @param additionalData Additional data to include in the response
- * @returns Formatted error response
- */
-const createErrorResponse = (error: any, status = 500, additionalData = {}) => {
-  const errorMessage = error instanceof Error ? error.message : String(error)
-  const errorStack = error instanceof Error ? error.stack : undefined
-
-  logger.error('Creating error response', {
-    errorMessage,
-    status,
-    stack: isDev ? errorStack : undefined,
-  })
-
-  return formatResponse(
-    {
-      success: false,
-      error: errorMessage,
-      stack: isDev ? errorStack : undefined,
-      ...additionalData,
-    },
-    status
-  )
-}
-
-/**
- * GET handler for direct external URL proxying
- * This allows for GET requests to external APIs
- */
-export async function GET(request: Request) {
-  const url = new URL(request.url)
-  const targetUrl = url.searchParams.get('url')
-  const requestId = generateRequestId()
-
-  // Vault download proxy: /api/proxy?vaultDownload=1&bucket=...&object=...&credentialId=...
-  const vaultDownload = url.searchParams.get('vaultDownload')
-  if (vaultDownload === '1') {
-    try {
-      const bucket = url.searchParams.get('bucket')
-      const objectParam = url.searchParams.get('object')
-      const credentialId = url.searchParams.get('credentialId')
-
-      if (!bucket || !objectParam || !credentialId) {
-        return createErrorResponse('Missing bucket, object, or credentialId', 400)
-      }
-
-      // Fetch access token using existing token API
-      const baseUrl = new URL(getBaseUrl())
-      const tokenUrl = new URL('/api/auth/oauth/token', baseUrl)
-
-      // Build headers: forward session cookies if present; include internal auth for server-side
-      const tokenHeaders: Record<string, string> = { 'Content-Type': 'application/json' }
-      const incomingCookie = request.headers.get('cookie')
-      if (incomingCookie) tokenHeaders.Cookie = incomingCookie
-      try {
-        const internalToken = await generateInternalToken()
-        tokenHeaders.Authorization = `Bearer ${internalToken}`
-      } catch (_e) {
-        // best-effort internal auth
-      }
-
-      // Optional workflow context for collaboration auth
-      const workflowId = url.searchParams.get('workflowId') || undefined
-
-      const tokenRes = await fetch(tokenUrl.toString(), {
-        method: 'POST',
-        headers: tokenHeaders,
-        body: JSON.stringify({ credentialId, workflowId }),
-      })
-
-      if (!tokenRes.ok) {
-        const err = await tokenRes.text()
-        return createErrorResponse(`Failed to fetch access token: ${err}`, 401)
-      }
-
-      const tokenJson = await tokenRes.json()
-      const accessToken = tokenJson.accessToken
-      if (!accessToken) {
-        return createErrorResponse('No access token available', 401)
-      }
-
-      // Avoid double-encoding: incoming object may already be percent-encoded
-      const objectDecoded = decodeURIComponent(objectParam)
-      const gcsUrl = `https://storage.googleapis.com/storage/v1/b/${encodeURIComponent(
-        bucket
-      )}/o/${encodeURIComponent(objectDecoded)}?alt=media`
-
-      const fileRes = await fetch(gcsUrl, {
-        headers: { Authorization: `Bearer ${accessToken}` },
-      })
-
-      if (!fileRes.ok) {
-        const errText = await fileRes.text()
-        return createErrorResponse(errText || 'Failed to download file', fileRes.status)
-      }
-
-      const headers = new Headers()
-      fileRes.headers.forEach((v, k) => headers.set(k, v))
-      return new NextResponse(fileRes.body, { status: 200, headers })
-    } catch (error: any) {
-      logger.error(`[${requestId}] Vault download proxy failed`, {
-        error: error instanceof Error ? error.message : String(error),
-      })
-      return createErrorResponse('Vault download failed', 500)
-    }
-  }
-
-  if (!targetUrl) {
-    logger.error(`[${requestId}] Missing 'url' parameter`)
-    return createErrorResponse("Missing 'url' parameter", 400)
-  }
-
-  const urlValidation = await validateUrlWithDNS(targetUrl)
-  if (!urlValidation.isValid) {
-    logger.warn(`[${requestId}] Blocked proxy request`, {
-      url: targetUrl.substring(0, 100),
-      error: urlValidation.error,
-    })
-    return createErrorResponse(urlValidation.error || 'Invalid URL', 403)
-  }
-
-  const method = url.searchParams.get('method') || 'GET'
-
-  const bodyParam = url.searchParams.get('body')
-  let body: string | undefined
-
-  if (bodyParam && ['POST', 'PUT', 'PATCH'].includes(method.toUpperCase())) {
-    try {
-      body = decodeURIComponent(bodyParam)
-    } catch (error) {
-      logger.warn(`[${requestId}] Failed to decode body parameter`, error)
-    }
-  }
-
-  const customHeaders: Record<string, string> = {}
-
-  for (const [key, value] of url.searchParams.entries()) {
-    if (key.startsWith('header.')) {
-      const headerName = key.substring(7)
-      customHeaders[headerName] = value
-    }
-  }
-
-  if (body && !customHeaders['Content-Type']) {
-    customHeaders['Content-Type'] = 'application/json'
-  }
-
-  logger.info(`[${requestId}] Proxying ${method} request to: ${targetUrl}`)
-
-  try {
-    const pinnedUrl = createPinnedUrl(targetUrl, urlValidation.resolvedIP!)
-    const response = await fetch(pinnedUrl, {
-      method: method,
-      headers: {
-        ...getProxyHeaders(),
-        ...customHeaders,
-        Host: urlValidation.originalHostname!,
-      },
-      body: body || undefined,
-    })
-
-    const contentType = response.headers.get('content-type') || ''
-    let data
-
-    if (contentType.includes('application/json')) {
-      data = await response.json()
-    } else {
-      data = await response.text()
-    }
-
-    const errorMessage = !response.ok
-      ? data && typeof data === 'object' && data.error
-        ? `${data.error.message || JSON.stringify(data.error)}`
-        : response.statusText || `HTTP error ${response.status}`
-      : undefined
-
-    if (!response.ok) {
-      logger.error(`[${requestId}] External API error: ${response.status} ${response.statusText}`)
-    }
-
-    return formatResponse({
-      success: response.ok,
-      status: response.status,
-      statusText: response.statusText,
-      headers: Object.fromEntries(response.headers.entries()),
-      data,
-      error: errorMessage,
-    })
-  } catch (error: any) {
-    logger.error(`[${requestId}] Proxy GET request failed`, {
-      url: targetUrl,
-      error: error instanceof Error ? error.message : String(error),
-      stack: error instanceof Error ? error.stack : undefined,
-    })
-
-    return createErrorResponse(error)
-  }
-}
-
-export async function POST(request: NextRequest) {
-  const requestId = generateRequestId()
-  const startTime = new Date()
-  const startTimeISO = startTime.toISOString()
-
-  try {
-    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })
-    if (!authResult.success) {
-      logger.error(`[${requestId}] Authentication failed for proxy:`, authResult.error)
-      return createErrorResponse('Unauthorized', 401)
-    }
-
-    let requestBody
-    try {
-      requestBody = await request.json()
-    } catch (parseError) {
-      logger.error(`[${requestId}] Failed to parse request body`, {
-        error: parseError instanceof Error ? parseError.message : String(parseError),
-      })
-      throw new Error('Invalid JSON in request body')
-    }
-
-    const validationResult = proxyPostSchema.safeParse(requestBody)
-    if (!validationResult.success) {
-      logger.error(`[${requestId}] Request validation failed`, {
-        errors: validationResult.error.errors,
-      })
-      const errorMessages = validationResult.error.errors
-        .map((err) => `${err.path.join('.')}: ${err.message}`)
-        .join(', ')
-      throw new Error(`Validation failed: ${errorMessages}`)
-    }
-
-    const { toolId, params } = validationResult.data
-
-    logger.info(`[${requestId}] Processing tool: ${toolId}`)
-
-    const tool = getTool(toolId)
-
-    if (!tool) {
-      logger.error(`[${requestId}] Tool not found: ${toolId}`)
-      throw new Error(`Tool not found: ${toolId}`)
-    }
-
-    try {
-      validateRequiredParametersAfterMerge(toolId, tool, params)
-    } catch (validationError) {
-      logger.warn(`[${requestId}] Tool validation failed for ${toolId}`, {
-        error: validationError instanceof Error ? validationError.message : String(validationError),
-      })
-
-      const endTime = new Date()
-      const endTimeISO = endTime.toISOString()
-      const duration = endTime.getTime() - startTime.getTime()
-
-      return createErrorResponse(validationError, 400, {
-        startTime: startTimeISO,
-        endTime: endTimeISO,
-        duration,
-      })
-    }
-
-    const hasFileOutputs =
-      tool.outputs &&
-      Object.values(tool.outputs).some(
-        (output) => output.type === 'file' || output.type === 'file[]'
-      )
-
-    const result = await executeTool(
-      toolId,
-      params,
-      true, // skipProxy (we're already in the proxy)
-      !hasFileOutputs, // skipPostProcess (don't skip if tool has file outputs)
-      undefined // execution context is not available in proxy context
-    )
-
-    if (!result.success) {
-      logger.warn(`[${requestId}] Tool execution failed for ${toolId}`, {
-        error: result.error || 'Unknown error',
-      })
-
-      throw new Error(result.error || 'Tool execution failed')
-    }
-
-    const endTime = new Date()
-    const endTimeISO = endTime.toISOString()
-    const duration = endTime.getTime() - startTime.getTime()
-
-    const responseWithTimingData = {
-      ...result,
-      startTime: startTimeISO,
-      endTime: endTimeISO,
-      duration,
-      timing: {
-        startTime: startTimeISO,
-        endTime: endTimeISO,
-        duration,
-      },
-    }
-
-    logger.info(`[${requestId}] Tool executed successfully: ${toolId} (${duration}ms)`)
-
-    return formatResponse(responseWithTimingData)
-  } catch (error: any) {
-    logger.error(`[${requestId}] Proxy request failed`, {
-      error: error instanceof Error ? error.message : String(error),
-      stack: error instanceof Error ? error.stack : undefined,
-      name: error instanceof Error ? error.name : undefined,
-    })
-
-    const endTime = new Date()
-    const endTimeISO = endTime.toISOString()
-    const duration = endTime.getTime() - startTime.getTime()
-
-    return createErrorResponse(error, 500, {
-      startTime: startTimeISO,
-      endTime: endTimeISO,
-      duration,
-    })
-  }
-}
-
-export async function OPTIONS() {
-  return new NextResponse(null, {
-    status: 204,
-    headers: {
-      'Access-Control-Allow-Origin': '*',
-      'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
-      'Access-Control-Allow-Headers': 'Content-Type, Authorization',
-      'Access-Control-Max-Age': '86400',
-    },
-  })
-}
--- a/apps/sim/app/api/tools/image/route.ts
+++ b/apps/sim/app/api/tools/image/route.ts
--- a/apps/sim/app/api/tools/stt/route.ts
+++ b/apps/sim/app/api/tools/stt/route.ts
--- a/apps/sim/app/api/tools/tts/route.ts
+++ b/apps/sim/app/api/tools/tts/route.ts
--- a/apps/sim/app/api/tools/tts/unified/route.ts
+++ b/apps/sim/app/api/tools/tts/unified/route.ts
--- a/apps/sim/app/api/tools/video/route.ts
+++ b/apps/sim/app/api/tools/video/route.ts
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -12,6 +12,10 @@ import { markExecutionCancelled } from '@/lib/execution/cancellation'
 import { processInputFileFields } from '@/lib/execution/files'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
+import {
+  cleanupExecutionBase64Cache,
+  hydrateUserFilesWithBase64,
+} from '@/lib/uploads/utils/user-file-base64.server'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
 import { type ExecutionEvent, encodeSSEEvent } from '@/lib/workflows/executor/execution-events'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
@@ -25,7 +29,7 @@ import type { WorkflowExecutionPayload } from '@/background/workflow-execution'
 import { normalizeName } from '@/executor/constants'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata, IterationContext } from '@/executor/execution/types'
-import type { StreamingExecution } from '@/executor/types'
+import type { NormalizedBlockOutput, StreamingExecution } from '@/executor/types'
 import { Serializer } from '@/serializer'
 import { CORE_TRIGGER_TYPES, type CoreTriggerType } from '@/stores/logs/filters/types'

@@ -38,6 +42,8 @@ const ExecuteWorkflowSchema = z.object({
  useDraftState: z.boolean().optional(),
  input: z.any().optional(),
  isClientSession: z.boolean().optional(),
+  includeFileBase64: z.boolean().optional().default(true),
+  base64MaxBytes: z.number().int().positive().optional(),
  workflowStateOverride: z
    .object({
      blocks: z.record(z.any()),
@@ -214,6 +220,8 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      useDraftState,
      input: validatedInput,
      isClientSession = false,
+      includeFileBase64,
+      base64MaxBytes,
      workflowStateOverride,
    } = validation.data

@@ -227,6 +235,8 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
              triggerType,
              stream,
              useDraftState,
+              includeFileBase64,
+              base64MaxBytes,
              workflowStateOverride,
              workflowId: _workflowId, // Also exclude workflowId used for internal JWT auth
              ...rest
@@ -427,16 +437,31 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
          snapshot,
          callbacks: {},
          loggingSession,
+          includeFileBase64,
+          base64MaxBytes,
        })

-        const hasResponseBlock = workflowHasResponseBlock(result)
+        const outputWithBase64 = includeFileBase64
+          ? ((await hydrateUserFilesWithBase64(result.output, {
+              requestId,
+              executionId,
+              maxBytes: base64MaxBytes,
+            })) as NormalizedBlockOutput)
+          : result.output
+
+        const resultWithBase64 = { ...result, output: outputWithBase64 }
+
+        // Cleanup base64 cache for this execution
+        await cleanupExecutionBase64Cache(executionId)
+
+        const hasResponseBlock = workflowHasResponseBlock(resultWithBase64)
        if (hasResponseBlock) {
-          return createHttpResponseFromBlock(result)
+          return createHttpResponseFromBlock(resultWithBase64)
        }

        const filteredResult = {
          success: result.success,
-          output: result.output,
+          output: outputWithBase64,
          error: result.error,
          metadata: result.metadata
            ? {
@@ -498,6 +523,8 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
          selectedOutputs: resolvedSelectedOutputs,
          isSecureMode: false,
          workflowTriggerType: triggerType === 'chat' ? 'chat' : 'api',
+          includeFileBase64,
+          base64MaxBytes,
        },
        executionId,
      })
@@ -698,6 +725,8 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
            },
            loggingSession,
            abortSignal: abortController.signal,
+            includeFileBase64,
+            base64MaxBytes,
          })

          if (result.status === 'paused') {
@@ -750,12 +779,21 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
            workflowId,
            data: {
              success: result.success,
-              output: result.output,
+              output: includeFileBase64
+                ? await hydrateUserFilesWithBase64(result.output, {
+                    requestId,
+                    executionId,
+                    maxBytes: base64MaxBytes,
+                  })
+                : result.output,
              duration: result.metadata?.duration || 0,
              startTime: result.metadata?.startTime || startTime.toISOString(),
              endTime: result.metadata?.endTime || new Date().toISOString(),
            },
          })
+
+          // Cleanup base64 cache for this execution
+          await cleanupExecutionBase64Cache(executionId)
        } catch (error: any) {
          const errorMessage = error.message || 'Unknown error'
          logger.error(`[${requestId}] SSE execution failed: ${errorMessage}`)
--- a/apps/sim/app/chat/hooks/use-chat-streaming.ts
+++ b/apps/sim/app/chat/hooks/use-chat-streaming.ts
@@ -2,7 +2,7 @@

 import { useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { isUserFile } from '@/lib/core/utils/display-filters'
+import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
 import type { ChatFile, ChatMessage } from '@/app/chat/components/message/message'
 import { CHAT_ERROR_MESSAGES } from '@/app/chat/constants'

@@ -17,7 +17,7 @@ function extractFilesFromData(
    return files
  }

-  if (isUserFile(data)) {
+  if (isUserFileWithMetadata(data)) {
    if (!seenIds.has(data.id)) {
      seenIds.add(data.id)
      files.push({
@@ -232,7 +232,7 @@ export function useChatStreaming() {
                    return null
                  }

-                  if (isUserFile(value)) {
+                  if (isUserFileWithMetadata(value)) {
                    return null
                  }

@@ -285,7 +285,7 @@ export function useChatStreaming() {

                    const value = getOutputValue(blockOutputs, config.path)

-                    if (isUserFile(value)) {
+                    if (isUserFileWithMetadata(value)) {
                      extractedFiles.push({
                        id: value.id,
                        name: value.name,
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx
@@ -2,7 +2,7 @@

 import { memo, useEffect, useMemo, useRef, useState } from 'react'
 import { ChevronUp, X } from 'lucide-react'
-import { Badge, Button, Eye } from '@/components/emcn'
+import { Button, Eye } from '@/components/emcn'
 import { ScrollArea } from '@/components/ui/scroll-area'
 import { BASE_EXECUTION_CHARGE } from '@/lib/billing/constants'
 import {
@@ -257,9 +257,9 @@ export const LogDetails = memo(function LogDetails({
                        Version
                      </span>
                      <div className='flex w-0 flex-1 justify-end'>
-                        <Badge variant='green' size='md' className='max-w-full truncate'>
+                        <span className='max-w-full truncate rounded-[6px] bg-[#14291B] px-[9px] py-[2px] font-medium text-[#86EFAC] text-[12px]'>
                          {log.deploymentVersionName || `v${log.deploymentVersion}`}
-                        </Badge>
+                        </span>
                      </div>
                    </div>
                  )}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/chat-history-skeleton/chat-history-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/chat-history-skeleton/chat-history-skeleton.tsx
@@ -1,22 +0,0 @@
-import { PopoverSection } from '@/components/emcn'
-
-/**
- * Skeleton loading component for chat history dropdown
- * Displays placeholder content while chats are being loaded
- */
-export function ChatHistorySkeleton() {
-  return (
-    <>
-      <PopoverSection>
-        <div className='h-3 w-12 animate-pulse rounded bg-muted/40' />
-      </PopoverSection>
-      <div className='flex flex-col gap-0.5'>
-        {[1, 2, 3].map((i) => (
-          <div key={i} className='flex h-[25px] items-center px-[6px]'>
-            <div className='h-3 w-full animate-pulse rounded bg-muted/40' />
-          </div>
-        ))}
-      </div>
-    </>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/chat-history-skeleton/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/chat-history-skeleton/index.ts
@@ -1 +0,0 @@
-export * from './chat-history-skeleton'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/checkpoint-confirmation/checkpoint-confirmation.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/checkpoint-confirmation/checkpoint-confirmation.tsx
@@ -1,79 +0,0 @@
-import { Button } from '@/components/emcn'
-
-type CheckpointConfirmationVariant = 'restore' | 'discard'
-
-interface CheckpointConfirmationProps {
-  /** Confirmation variant - 'restore' for reverting, 'discard' for edit with checkpoint options */
-  variant: CheckpointConfirmationVariant
-  /** Whether an action is currently processing */
-  isProcessing: boolean
-  /** Callback when cancel is clicked */
-  onCancel: () => void
-  /** Callback when revert is clicked */
-  onRevert: () => void
-  /** Callback when continue is clicked (only for 'discard' variant) */
-  onContinue?: () => void
-}
-
-/**
- * Inline confirmation for checkpoint operations
- * Supports two variants:
- * - 'restore': Simple revert confirmation with warning
- * - 'discard': Edit with checkpoint options (revert or continue without revert)
- */
-export function CheckpointConfirmation({
-  variant,
-  isProcessing,
-  onCancel,
-  onRevert,
-  onContinue,
-}: CheckpointConfirmationProps) {
-  const isRestoreVariant = variant === 'restore'
-
-  return (
-    <div className='mt-[8px] rounded-[4px] border border-[var(--border)] bg-[var(--surface-4)] p-[10px]'>
-      <p className='mb-[8px] text-[12px] text-[var(--text-primary)]'>
-        {isRestoreVariant ? (
-          <>
-            Revert to checkpoint? This will restore your workflow to the state saved at this
-            checkpoint.{' '}
-            <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
-          </>
-        ) : (
-          'Continue from a previous message?'
-        )}
-      </p>
-      <div className='flex gap-[8px]'>
-        <Button
-          onClick={onCancel}
-          variant='active'
-          size='sm'
-          className='flex-1'
-          disabled={isProcessing}
-        >
-          Cancel
-        </Button>
-        <Button
-          onClick={onRevert}
-          variant='destructive'
-          size='sm'
-          className='flex-1'
-          disabled={isProcessing}
-        >
-          {isProcessing ? 'Reverting...' : 'Revert'}
-        </Button>
-        {!isRestoreVariant && onContinue && (
-          <Button
-            onClick={onContinue}
-            variant='tertiary'
-            size='sm'
-            className='flex-1'
-            disabled={isProcessing}
-          >
-            Continue
-          </Button>
-        )}
-      </div>
-    </div>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/checkpoint-confirmation/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/checkpoint-confirmation/index.ts
@@ -1 +0,0 @@
-export * from './checkpoint-confirmation'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display/file-display.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display/file-display.tsx
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display/index.ts
@@ -1 +0,0 @@
-export * from './file-display'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/index.ts
@@ -1,6 +1,5 @@
-export * from './checkpoint-confirmation'
 export * from './file-display'
-export { CopilotMarkdownRenderer } from './markdown-renderer'
+export { default as CopilotMarkdownRenderer } from './markdown-renderer'
 export * from './smooth-streaming'
 export * from './thinking-block'
 export * from './usage-limit-actions'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer/markdown-renderer.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer/markdown-renderer.tsx
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer/index.ts
@@ -1 +0,0 @@
-export { default as CopilotMarkdownRenderer } from './markdown-renderer'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming/smooth-streaming.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming/smooth-streaming.tsx
@@ -1,17 +1,27 @@
 import { memo, useEffect, useRef, useState } from 'react'
 import { cn } from '@/lib/core/utils/cn'
-import { CopilotMarkdownRenderer } from '../markdown-renderer'
+import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'

-/** Character animation delay in milliseconds */
+/**
+ * Character animation delay in milliseconds
+ */
 const CHARACTER_DELAY = 3

-/** Props for the StreamingIndicator component */
+/**
+ * Props for the StreamingIndicator component
+ */
 interface StreamingIndicatorProps {
  /** Optional class name for layout adjustments */
  className?: string
 }

-/** Shows animated dots during message streaming when no content has arrived */
+/**
+ * StreamingIndicator shows animated dots during message streaming
+ * Used as a standalone indicator when no content has arrived yet
+ *
+ * @param props - Component props
+ * @returns Animated loading indicator
+ */
 export const StreamingIndicator = memo(({ className }: StreamingIndicatorProps) => (
  <div className={cn('flex h-[1.25rem] items-center text-muted-foreground', className)}>
    <div className='flex space-x-0.5'>
@@ -24,7 +34,9 @@ export const StreamingIndicator = memo(({ className }: StreamingIndicatorProps)

 StreamingIndicator.displayName = 'StreamingIndicator'

-/** Props for the SmoothStreamingText component */
+/**
+ * Props for the SmoothStreamingText component
+ */
 interface SmoothStreamingTextProps {
  /** Content to display with streaming animation */
  content: string
@@ -32,12 +44,20 @@ interface SmoothStreamingTextProps {
  isStreaming: boolean
 }

-/** Displays text with character-by-character animation for smooth streaming */
+/**
+ * SmoothStreamingText component displays text with character-by-character animation
+ * Creates a smooth streaming effect for AI responses
+ *
+ * @param props - Component props
+ * @returns Streaming text with smooth animation
+ */
 export const SmoothStreamingText = memo(
  ({ content, isStreaming }: SmoothStreamingTextProps) => {
+    // Initialize with full content when not streaming to avoid flash on page load
    const [displayedContent, setDisplayedContent] = useState(() => (isStreaming ? '' : content))
    const contentRef = useRef(content)
    const timeoutRef = useRef<NodeJS.Timeout | null>(null)
+    // Initialize index based on streaming state
    const indexRef = useRef(isStreaming ? 0 : content.length)
    const isAnimatingRef = useRef(false)

@@ -75,6 +95,7 @@ export const SmoothStreamingText = memo(
          }
        }
      } else {
+        // Streaming ended - show full content immediately
        if (timeoutRef.current) {
          clearTimeout(timeoutRef.current)
        }
@@ -98,6 +119,7 @@ export const SmoothStreamingText = memo(
    )
  },
  (prevProps, nextProps) => {
+    // Prevent re-renders during streaming unless content actually changed
    return (
      prevProps.content === nextProps.content && prevProps.isStreaming === nextProps.isStreaming
    )
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming/index.ts
@@ -1 +0,0 @@
-export * from './smooth-streaming'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block/thinking-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block/thinking-block.tsx
@@ -3,45 +3,66 @@
 import { memo, useEffect, useMemo, useRef, useState } from 'react'
 import clsx from 'clsx'
 import { ChevronUp } from 'lucide-react'
-import { CopilotMarkdownRenderer } from '../markdown-renderer'
+import CopilotMarkdownRenderer from './markdown-renderer'

-/** Removes thinking tags (raw or escaped) and special tags from streamed content */
+/**
+ * Removes thinking tags (raw or escaped) from streamed content.
+ */
 function stripThinkingTags(text: string): string {
  return text
    .replace(/<\/?thinking[^>]*>/gi, '')
    .replace(/&lt;\/?thinking[^&]*&gt;/gi, '')
-    .replace(/<options>[\s\S]*?<\/options>/gi, '')
-    .replace(/<options>[\s\S]*$/gi, '')
-    .replace(/<plan>[\s\S]*?<\/plan>/gi, '')
-    .replace(/<plan>[\s\S]*$/gi, '')
    .trim()
 }

-/** Interval for auto-scroll during streaming (ms) */
+/**
+ * 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
+
+/**
+ * Interval for auto-scroll during streaming (ms)
+ */
 const SCROLL_INTERVAL = 50

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

-/** Thinking text streaming delay - faster than main text */
+/**
+ * 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 */
+/**
+ * Props for the SmoothThinkingText component
+ */
 interface SmoothThinkingTextProps {
  content: string
  isStreaming: boolean
 }

 /**
- * Renders thinking content with fast streaming animation.
+ * SmoothThinkingText renders thinking content with fast streaming animation
+ * Uses gradient fade at top when content is tall enough
 */
 const SmoothThinkingText = memo(
  ({ content, isStreaming }: SmoothThinkingTextProps) => {
+    // Initialize with full content when not streaming to avoid flash on page load
    const [displayedContent, setDisplayedContent] = useState(() => (isStreaming ? '' : content))
+    const [showGradient, setShowGradient] = useState(false)
    const contentRef = useRef(content)
    const textRef = useRef<HTMLDivElement>(null)
    const rafRef = useRef<number | null>(null)
+    // Initialize index based on streaming state
    const indexRef = useRef(isStreaming ? 0 : content.length)
    const lastFrameTimeRef = useRef<number>(0)
    const isAnimatingRef = useRef(false)
@@ -67,6 +88,7 @@ const SmoothThinkingText = memo(

            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
@@ -88,6 +110,7 @@ const SmoothThinkingText = memo(
          rafRef.current = requestAnimationFrame(animateText)
        }
      } else {
+        // Streaming ended - show full content immediately
        if (rafRef.current) {
          cancelAnimationFrame(rafRef.current)
        }
@@ -104,10 +127,30 @@ const SmoothThinkingText = memo(
      }
    }, [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>
@@ -122,7 +165,9 @@ const SmoothThinkingText = memo(

 SmoothThinkingText.displayName = 'SmoothThinkingText'

-/** Props for the ThinkingBlock component */
+/**
+ * Props for the ThinkingBlock component
+ */
 interface ThinkingBlockProps {
  /** Content of the thinking block */
  content: string
@@ -137,8 +182,13 @@ interface ThinkingBlockProps {
 }

 /**
- * Displays AI reasoning/thinking process with collapsible content and duration timer.
- * Auto-expands during streaming and collapses when complete.
+ * ThinkingBlock component displays AI reasoning/thinking process
+ * Shows collapsible content with duration timer
+ * Auto-expands during streaming and collapses when complete
+ * Auto-collapses when a tool call or other content comes in after it
+ *
+ * @param props - Component props
+ * @returns Thinking block with expandable content and timer
 */
 export function ThinkingBlock({
  content,
@@ -147,6 +197,7 @@ export function ThinkingBlock({
  label = 'Thought',
  hasSpecialTags = false,
 }: ThinkingBlockProps) {
+  // Strip thinking tags from content on render to handle persisted messages
  const cleanContent = useMemo(() => stripThinkingTags(content || ''), [content])

  const [isExpanded, setIsExpanded] = useState(false)
@@ -158,8 +209,12 @@ export function ThinkingBlock({
  const lastScrollTopRef = useRef(0)
  const programmaticScrollRef = useRef(false)

-  /** Auto-expands during streaming, auto-collapses when streaming ends or following content arrives */
+  /**
+   * Auto-expands block when streaming with content
+   * 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) {
      setIsExpanded(false)
      userCollapsedRef.current = false
@@ -172,6 +227,7 @@ export function ThinkingBlock({
    }
  }, [isStreaming, cleanContent, hasFollowingContent, hasSpecialTags])

+  // Reset start time when streaming begins
  useEffect(() => {
    if (isStreaming && !hasFollowingContent) {
      startTimeRef.current = Date.now()
@@ -180,7 +236,9 @@ export function ThinkingBlock({
    }
  }, [isStreaming, hasFollowingContent])

+  // Update duration timer during streaming (stop when following content arrives)
  useEffect(() => {
+    // Stop timer if not streaming or if there's following content (thinking is done)
    if (!isStreaming || hasFollowingContent) return

    const interval = setInterval(() => {
@@ -190,6 +248,7 @@ export function ThinkingBlock({
    return () => clearInterval(interval)
  }, [isStreaming, hasFollowingContent])

+  // Handle scroll events to detect user scrolling away
  useEffect(() => {
    const container = scrollContainerRef.current
    if (!container || !isExpanded) return
@@ -208,6 +267,7 @@ export function ThinkingBlock({
        setUserHasScrolledAway(true)
      }

+      // Re-stick if user scrolls back to bottom with intent
      if (userHasScrolledAway && isNearBottom && delta > 10) {
        setUserHasScrolledAway(false)
      }
@@ -221,6 +281,7 @@ export function ThinkingBlock({
    return () => container.removeEventListener('scroll', handleScroll)
  }, [isExpanded, userHasScrolledAway])

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

@@ -241,16 +302,20 @@ export function ThinkingBlock({
    return () => window.clearInterval(intervalId)
  }, [isStreaming, isExpanded, userHasScrolledAway])

-  /** Formats duration in milliseconds to seconds (minimum 1s) */
+  /**
+   * Formats duration in milliseconds to seconds
+   * Always shows seconds, rounded to nearest whole second, minimum 1s
+   */
  const formatDuration = (ms: number) => {
    const seconds = Math.max(1, Math.round(ms / 1000))
    return `${seconds}s`
  }

  const hasContent = cleanContent.length > 0
+  // Thinking is "done" when streaming ends OR when there's following content (like a tool call) OR when special tags appear
  const isThinkingDone = !isStreaming || hasFollowingContent || hasSpecialTags
  const durationText = `${label} for ${formatDuration(duration)}`
-
+  // Convert past tense label to present tense for streaming (e.g., "Thought" → "Thinking")
  const getStreamingLabel = (lbl: string) => {
    if (lbl === 'Thought') return 'Thinking'
    if (lbl.endsWith('ed')) return `${lbl.slice(0, -2)}ing`
@@ -258,9 +323,11 @@ export function ThinkingBlock({
  }
  const streamingLabel = getStreamingLabel(label)

+  // During streaming: show header with shimmer effect + expanded content
  if (!isThinkingDone) {
    return (
      <div>
+        {/* Define shimmer keyframes */}
        <style>{`
          @keyframes thinking-shimmer {
            0% { background-position: 150% 0; }
@@ -329,6 +396,7 @@ export function ThinkingBlock({
    )
  }

+  // After done: show collapsible header with duration
  return (
    <div>
      <button
@@ -358,6 +426,7 @@ export function ThinkingBlock({
          isExpanded ? 'mt-1.5 max-h-[150px] 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)]'>
          <CopilotMarkdownRenderer content={cleanContent} />
        </div>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block/index.ts
@@ -1 +0,0 @@
-export * from './thinking-block'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/usage-limit-actions/usage-limit-actions.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/usage-limit-actions/usage-limit-actions.tsx
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/usage-limit-actions/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/usage-limit-actions/index.ts
@@ -1 +0,0 @@
-export * from './usage-limit-actions'
--- 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
@@ -9,20 +9,18 @@ import {
  ToolCall,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components'
 import {
-  CheckpointConfirmation,
  FileAttachmentDisplay,
  SmoothStreamingText,
  StreamingIndicator,
  ThinkingBlock,
  UsageLimitActions,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components'
-import { CopilotMarkdownRenderer } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
+import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
 import {
  useCheckpointManagement,
  useMessageEditing,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks'
 import { UserInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input'
-import { buildMentionHighlightNodes } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
 import type { CopilotMessage as CopilotMessageType } from '@/stores/panel'
 import { useCopilotStore } from '@/stores/panel'

@@ -70,6 +68,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
    const isUser = message.role === 'user'
    const isAssistant = message.role === 'assistant'

+    // Store state
    const {
      messageCheckpoints: allMessageCheckpoints,
      messages,
@@ -80,18 +79,23 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
      isAborting,
    } = useCopilotStore()

+    // Get checkpoints for this message if it's a user message
    const messageCheckpoints = isUser ? allMessageCheckpoints[message.id] || [] : []
    const hasCheckpoints = messageCheckpoints.length > 0 && messageCheckpoints.some((cp) => cp?.id)

+    // Check if this is the last user message (for showing abort button)
    const isLastUserMessage = useMemo(() => {
      if (!isUser) return false
      const userMessages = messages.filter((m) => m.role === 'user')
      return userMessages.length > 0 && userMessages[userMessages.length - 1]?.id === message.id
    }, [isUser, messages, message.id])

+    // UI state
    const [isHoveringMessage, setIsHoveringMessage] = useState(false)
+
    const cancelEditRef = useRef<(() => void) | null>(null)

+    // Checkpoint management hook
    const {
      showRestoreConfirmation,
      showCheckpointDiscardModal,
@@ -114,6 +118,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
      () => cancelEditRef.current?.()
    )

+    // Message editing hook
    const {
      isEditMode,
      isExpanded,
@@ -142,20 +147,27 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(

    cancelEditRef.current = handleCancelEdit

+    // Get clean text content with double newline parsing
    const cleanTextContent = useMemo(() => {
      if (!message.content) return ''
+
+      // Parse out excessive newlines (more than 2 consecutive newlines)
      return message.content.replace(/\n{3,}/g, '\n\n')
    }, [message.content])

+    // Parse special tags from message content (options, plan)
+    // Parse during streaming to show options/plan as they stream in
    const parsedTags = useMemo(() => {
      if (isUser) return null

+      // Try message.content first
      if (message.content) {
        const parsed = parseSpecialTags(message.content)
        if (parsed.options || parsed.plan) return parsed
      }

-      if (message.contentBlocks && message.contentBlocks.length > 0) {
+      // During streaming, check content blocks for options/plan
+      if (isStreaming && message.contentBlocks && message.contentBlocks.length > 0) {
        for (const block of message.contentBlocks) {
          if (block.type === 'text' && block.content) {
            const parsed = parseSpecialTags(block.content)
@@ -164,42 +176,23 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        }
      }

-      return null
-    }, [message.content, message.contentBlocks, isUser])
-
-    const selectedOptionKey = useMemo(() => {
-      if (!parsedTags?.options || isStreaming) return null
-
-      const currentIndex = messages.findIndex((m) => m.id === message.id)
-      if (currentIndex === -1 || currentIndex >= messages.length - 1) return null
-
-      const nextMessage = messages[currentIndex + 1]
-      if (!nextMessage || nextMessage.role !== 'user') return null
-
-      const nextContent = nextMessage.content?.trim()
-      if (!nextContent) return null
-
-      for (const [key, option] of Object.entries(parsedTags.options)) {
-        const optionTitle = typeof option === 'string' ? option : option.title
-        if (nextContent === optionTitle) {
-          return key
-        }
-      }
-
-      return null
-    }, [parsedTags?.options, messages, message.id, isStreaming])
+      return message.content ? parseSpecialTags(message.content) : null
+    }, [message.content, message.contentBlocks, isUser, isStreaming])

+    // Get sendMessage from store for continuation actions
    const sendMessage = useCopilotStore((s) => s.sendMessage)

+    // Handler for option selection
    const handleOptionSelect = useCallback(
      (_optionKey: string, optionText: string) => {
+        // Send the option text as a message
        sendMessage(optionText)
      },
      [sendMessage]
    )

-    const isActivelyStreaming = isLastMessage && isStreaming
-
+    // 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
@@ -209,21 +202,21 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        if (block.type === 'text') {
          const isLastTextBlock =
            index === message.contentBlocks!.length - 1 && block.type === 'text'
+          // Always strip special tags from display (they're rendered separately as options/plan)
          const parsed = parseSpecialTags(block.content)
          const cleanBlockContent = parsed.cleanContent.replace(/\n{3,}/g, '\n\n')

+          // Skip if no content after stripping tags
          if (!cleanBlockContent.trim()) return null

-          const shouldUseSmoothing = isActivelyStreaming && isLastTextBlock
+          // 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'>
              {shouldUseSmoothing ? (
-                <SmoothStreamingText
-                  content={cleanBlockContent}
-                  isStreaming={isActivelyStreaming}
-                />
+                <SmoothStreamingText content={cleanBlockContent} isStreaming={isStreaming} />
              ) : (
                <CopilotMarkdownRenderer content={cleanBlockContent} />
              )}
@@ -231,7 +224,9 @@ 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}`

@@ -239,7 +234,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
            <div key={blockKey} className='w-full'>
              <ThinkingBlock
                content={block.content}
-                isStreaming={isActivelyStreaming}
+                isStreaming={isStreaming}
                hasFollowingContent={hasFollowingContent}
                hasSpecialTags={hasSpecialTags}
              />
@@ -251,22 +246,18 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(

          return (
            <div key={blockKey}>
-              <ToolCall
-                toolCallId={block.toolCall.id}
-                toolCall={block.toolCall}
-                isCurrentMessage={isLastMessage}
-              />
+              <ToolCall toolCallId={block.toolCall.id} toolCall={block.toolCall} />
            </div>
          )
        }
        return null
      })
-    }, [message.contentBlocks, isActivelyStreaming, parsedTags, isLastMessage])
+    }, [message.contentBlocks, isStreaming, parsedTags])

    if (isUser) {
      return (
        <div
-          className={`w-full max-w-full flex-none overflow-hidden transition-opacity duration-200 [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}
        >
          {isEditMode ? (
@@ -297,15 +288,42 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
                initialContexts={message.contexts}
              />

-              {/* Inline checkpoint confirmation - shown below input in edit mode */}
+              {/* Inline Checkpoint Discard Confirmation - shown below input in edit mode */}
              {showCheckpointDiscardModal && (
-                <CheckpointConfirmation
-                  variant='discard'
-                  isProcessing={isProcessingDiscard}
-                  onCancel={handleCancelCheckpointDiscard}
-                  onRevert={handleContinueAndRevert}
-                  onContinue={handleContinueWithoutRevert}
-                />
+                <div className='mt-[8px] rounded-[4px] border border-[var(--border)] bg-[var(--surface-4)] p-[10px]'>
+                  <p className='mb-[8px] text-[12px] text-[var(--text-primary)]'>
+                    Continue from a previous message?
+                  </p>
+                  <div className='flex gap-[8px]'>
+                    <Button
+                      onClick={handleCancelCheckpointDiscard}
+                      variant='active'
+                      size='sm'
+                      className='flex-1'
+                      disabled={isProcessingDiscard}
+                    >
+                      Cancel
+                    </Button>
+                    <Button
+                      onClick={handleContinueAndRevert}
+                      variant='destructive'
+                      size='sm'
+                      className='flex-1'
+                      disabled={isProcessingDiscard}
+                    >
+                      {isProcessingDiscard ? 'Reverting...' : 'Revert'}
+                    </Button>
+                    <Button
+                      onClick={handleContinueWithoutRevert}
+                      variant='tertiary'
+                      size='sm'
+                      className='flex-1'
+                      disabled={isProcessingDiscard}
+                    >
+                      Continue
+                    </Button>
+                  </div>
+                </div>
              )}
            </div>
          ) : (
@@ -330,15 +348,46 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
                  ref={messageContentRef}
                  className={`relative whitespace-pre-wrap break-words px-[2px] py-1 font-medium font-sans text-[var(--text-primary)] text-sm leading-[1.25rem] ${isSendingMessage && isLastUserMessage && isHoveringMessage ? 'pr-7' : ''} ${!isExpanded && needsExpansion ? 'max-h-[60px] overflow-hidden' : 'overflow-visible'}`}
                >
-                  {buildMentionHighlightNodes(
-                    message.content || '',
-                    message.contexts || [],
-                    (token, key) => (
-                      <span key={key} className='rounded-[4px] bg-[rgba(50,189,126,0.65)] py-[1px]'>
-                        {token}
-                      </span>
-                    )
-                  )}
+                  {(() => {
+                    const text = message.content || ''
+                    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 escapeRegex = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+                    const pattern = new RegExp(`(${tokens.map(escapeRegex).join('|')})`, 'g')
+
+                    const nodes: React.ReactNode[] = []
+                    let lastIndex = 0
+                    let match: RegExpExecArray | null
+                    while ((match = pattern.exec(text)) !== null) {
+                      const i = match.index
+                      const before = text.slice(lastIndex, i)
+                      if (before) nodes.push(before)
+                      const mention = match[0]
+                      nodes.push(
+                        <span
+                          key={`mention-${i}-${lastIndex}`}
+                          className='rounded-[4px] bg-[rgba(50,189,126,0.65)] py-[1px]'
+                        >
+                          {mention}
+                        </span>
+                      )
+                      lastIndex = i + mention.length
+                    }
+                    const tail = text.slice(lastIndex)
+                    if (tail) nodes.push(tail)
+                    return nodes
+                  })()}
                </div>

                {/* Gradient fade when truncated - applies to entire message box */}
@@ -388,30 +437,65 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
            </div>
          )}

-          {/* Inline restore checkpoint confirmation */}
+          {/* Inline Restore Checkpoint Confirmation */}
          {showRestoreConfirmation && (
-            <CheckpointConfirmation
-              variant='restore'
-              isProcessing={isReverting}
-              onCancel={handleCancelRevert}
-              onRevert={handleConfirmRevert}
-            />
+            <div className='mt-[8px] rounded-[4px] border border-[var(--border)] bg-[var(--surface-4)] p-[10px]'>
+              <p className='mb-[8px] text-[12px] text-[var(--text-primary)]'>
+                Revert to checkpoint? This will restore your workflow to the state saved at this
+                checkpoint.{' '}
+                <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              </p>
+              <div className='flex gap-[8px]'>
+                <Button
+                  onClick={handleCancelRevert}
+                  variant='active'
+                  size='sm'
+                  className='flex-1'
+                  disabled={isReverting}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  onClick={handleConfirmRevert}
+                  variant='destructive'
+                  size='sm'
+                  className='flex-1'
+                  disabled={isReverting}
+                >
+                  {isReverting ? 'Reverting...' : 'Revert'}
+                </Button>
+              </div>
+            </div>
          )}
        </div>
      )
    }

+    // 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 flex-none overflow-hidden [max-width:var(--panel-max-width)] ${isDimmed ? 'opacity-40' : 'opacity-100'}`}
+          className={`w-full max-w-full overflow-hidden [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-[4px] px-[2px] pb-[4px]'>
+          <div className='max-w-full space-y-1 px-[2px]'>
            {/* Content blocks in chronological order */}
-            {memoizedContentBlocks || (isStreaming && <div className='min-h-0' />)}
+            {memoizedContentBlocks}

-            {isStreaming && <StreamingIndicator />}
+            {isStreaming && (
+              <StreamingIndicator className={!hasVisibleContent ? 'mt-1' : undefined} />
+            )}

            {message.errorType === 'usage_limit' && (
              <div className='flex gap-1.5'>
@@ -450,7 +534,6 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
                  isLastMessage && !isStreaming && parsedTags.optionsComplete === true
                }
                streaming={isStreaming || !parsedTags.optionsComplete}
-                selectedOptionKey={selectedOptionKey}
              />
            )}
          </div>
@@ -461,22 +544,50 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
    return null
  },
  (prevProps, nextProps) => {
+    // Custom comparison function for better streaming performance
    const prevMessage = prevProps.message
    const nextMessage = nextProps.message

-    if (prevMessage.id !== nextMessage.id) return false
-    if (prevProps.isStreaming !== nextProps.isStreaming) return false
-    if (prevProps.isDimmed !== nextProps.isDimmed) return false
-    if (prevProps.panelWidth !== nextProps.panelWidth) return false
-    if (prevProps.checkpointCount !== nextProps.checkpointCount) return false
-    if (prevProps.isLastMessage !== nextProps.isLastMessage) return false
+    // If message IDs are different, always re-render
+    if (prevMessage.id !== nextMessage.id) {
+      return false
+    }

+    // If streaming state changed, re-render
+    if (prevProps.isStreaming !== nextProps.isStreaming) {
+      return false
+    }
+
+    // If dimmed state changed, re-render
+    if (prevProps.isDimmed !== nextProps.isDimmed) {
+      return false
+    }
+
+    // If panel width changed, re-render
+    if (prevProps.panelWidth !== nextProps.panelWidth) {
+      return false
+    }
+
+    // If checkpoint count changed, re-render
+    if (prevProps.checkpointCount !== nextProps.checkpointCount) {
+      return false
+    }
+
+    // If isLastMessage changed, re-render (for options visibility)
+    if (prevProps.isLastMessage !== nextProps.isLastMessage) {
+      return false
+    }
+
+    // For streaming messages, check if content actually changed
    if (nextProps.isStreaming) {
      const prevBlocks = prevMessage.contentBlocks || []
      const nextBlocks = nextMessage.contentBlocks || []

-      if (prevBlocks.length !== nextBlocks.length) return false
+      if (prevBlocks.length !== nextBlocks.length) {
+        return false // Content blocks changed
+      }

+      // Helper: get last block content by type
      const getLastBlockContent = (blocks: any[], type: 'text' | 'thinking'): string | null => {
        for (let i = blocks.length - 1; i >= 0; i--) {
          const block = blocks[i]
@@ -487,6 +598,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        return null
      }

+      // Re-render if the last text block content changed
      const prevLastTextContent = getLastBlockContent(prevBlocks as any[], 'text')
      const nextLastTextContent = getLastBlockContent(nextBlocks as any[], 'text')
      if (
@@ -497,6 +609,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        return false
      }

+      // Re-render if the last thinking block content changed
      const prevLastThinkingContent = getLastBlockContent(prevBlocks as any[], 'thinking')
      const nextLastThinkingContent = getLastBlockContent(nextBlocks as any[], 'thinking')
      if (
@@ -507,18 +620,24 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        return false
      }

+      // Check if tool calls changed
      const prevToolCalls = prevMessage.toolCalls || []
      const nextToolCalls = nextMessage.toolCalls || []

-      if (prevToolCalls.length !== nextToolCalls.length) return false
+      if (prevToolCalls.length !== nextToolCalls.length) {
+        return false // Tool calls count changed
+      }

      for (let i = 0; i < nextToolCalls.length; i++) {
-        if (prevToolCalls[i]?.state !== nextToolCalls[i]?.state) return false
+        if (prevToolCalls[i]?.state !== nextToolCalls[i]?.state) {
+          return false // Tool call state changed
+        }
      }

      return true
    }

+    // For non-streaming messages, do a deeper comparison including tool call states
    if (
      prevMessage.content !== nextMessage.content ||
      prevMessage.role !== nextMessage.role ||
@@ -528,12 +647,16 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
      return false
    }

+    // Check tool call states for non-streaming messages too
    const prevToolCalls = prevMessage.toolCalls || []
    const nextToolCalls = nextMessage.toolCalls || []
    for (let i = 0; i < nextToolCalls.length; i++) {
-      if (prevToolCalls[i]?.state !== nextToolCalls[i]?.state) return false
+      if (prevToolCalls[i]?.state !== nextToolCalls[i]?.state) {
+        return false // Tool call state changed
+      }
    }

+    // Check contentBlocks tool call states
    const prevContentBlocks = prevMessage.contentBlocks || []
    const nextContentBlocks = nextMessage.contentBlocks || []
    for (let i = 0; i < nextContentBlocks.length; i++) {
@@ -544,7 +667,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        nextBlock?.type === 'tool_call' &&
        prevBlock.toolCall?.state !== nextBlock.toolCall?.state
      ) {
-        return false
+        return false // ContentBlock tool call state changed
      }
    }

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
@@ -15,7 +15,6 @@ const logger = createLogger('useCheckpointManagement')
 * @param messageCheckpoints - Checkpoints for this message
 * @param onRevertModeChange - Callback for revert mode changes
 * @param onEditModeChange - Callback for edit mode changes
- * @param onCancelEdit - Callback when edit is cancelled
 * @returns Checkpoint management utilities
 */
 export function useCheckpointManagement(
@@ -38,13 +37,17 @@ export function useCheckpointManagement(

  const { revertToCheckpoint, currentChat } = useCopilotStore()

-  /** Initiates checkpoint revert confirmation */
+  /**
+   * Handles initiating checkpoint revert
+   */
  const handleRevertToCheckpoint = useCallback(() => {
    setShowRestoreConfirmation(true)
    onRevertModeChange?.(true)
  }, [onRevertModeChange])

-  /** Confirms and executes checkpoint revert */
+  /**
+   * Confirms checkpoint revert and updates state
+   */
  const handleConfirmRevert = useCallback(async () => {
    if (messageCheckpoints.length > 0) {
      const latestCheckpoint = messageCheckpoints[0]
@@ -113,13 +116,18 @@ export function useCheckpointManagement(
    onRevertModeChange,
  ])

-  /** Cancels checkpoint revert */
+  /**
+   * Cancels checkpoint revert
+   */
  const handleCancelRevert = useCallback(() => {
    setShowRestoreConfirmation(false)
    onRevertModeChange?.(false)
  }, [onRevertModeChange])

-  /** Reverts to checkpoint then proceeds with pending edit */
+  /**
+   * Handles "Continue and revert" action for checkpoint discard modal
+   * Reverts to checkpoint then proceeds with pending edit
+   */
  const handleContinueAndRevert = useCallback(async () => {
    setIsProcessingDiscard(true)
    try {
@@ -176,7 +184,9 @@ export function useCheckpointManagement(
    }
  }, [messageCheckpoints, revertToCheckpoint, message, messages, onEditModeChange, onCancelEdit])

-  /** Cancels checkpoint discard and clears pending edit */
+  /**
+   * Cancels checkpoint discard and clears pending edit
+   */
  const handleCancelCheckpointDiscard = useCallback(() => {
    setShowCheckpointDiscardModal(false)
    onEditModeChange?.(false)
@@ -184,11 +194,11 @@ export function useCheckpointManagement(
    pendingEditRef.current = null
  }, [onEditModeChange, onCancelEdit])

-  /** Continues with edit without reverting checkpoint */
+  /**
+   * Continues with edit WITHOUT reverting checkpoint
+   */
  const handleContinueWithoutRevert = useCallback(async () => {
    setShowCheckpointDiscardModal(false)
-    onEditModeChange?.(false)
-    onCancelEdit?.()

    if (pendingEditRef.current) {
      const { message: msg, fileAttachments, contexts } = pendingEditRef.current
@@ -215,34 +225,43 @@ export function useCheckpointManagement(
    }
  }, [message, messages, onEditModeChange, onCancelEdit])

-  /** Handles keyboard events for confirmation dialogs */
+  /**
+   * Handles keyboard events for restore confirmation (Escape/Enter)
+   */
  useEffect(() => {
-    const isActive = showRestoreConfirmation || showCheckpointDiscardModal
-    if (!isActive) return
+    if (!showRestoreConfirmation) return

    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.defaultPrevented) return
-
      if (event.key === 'Escape') {
-        if (showRestoreConfirmation) handleCancelRevert()
-        else handleCancelCheckpointDiscard()
+        handleCancelRevert()
      } else if (event.key === 'Enter') {
        event.preventDefault()
-        if (showRestoreConfirmation) handleConfirmRevert()
-        else handleContinueAndRevert()
+        handleConfirmRevert()
      }
    }

    document.addEventListener('keydown', handleKeyDown)
    return () => document.removeEventListener('keydown', handleKeyDown)
-  }, [
-    showRestoreConfirmation,
-    showCheckpointDiscardModal,
-    handleCancelRevert,
-    handleConfirmRevert,
-    handleCancelCheckpointDiscard,
-    handleContinueAndRevert,
-  ])
+  }, [showRestoreConfirmation, handleCancelRevert, handleConfirmRevert])
+
+  /**
+   * Handles keyboard events for checkpoint discard modal (Escape/Enter)
+   */
+  useEffect(() => {
+    if (!showCheckpointDiscardModal) return
+
+    const handleCheckpointDiscardKeyDown = async (event: KeyboardEvent) => {
+      if (event.key === 'Escape') {
+        handleCancelCheckpointDiscard()
+      } else if (event.key === 'Enter') {
+        event.preventDefault()
+        await handleContinueAndRevert()
+      }
+    }
+
+    document.addEventListener('keydown', handleCheckpointDiscardKeyDown)
+    return () => document.removeEventListener('keydown', handleCheckpointDiscardKeyDown)
+  }, [showCheckpointDiscardModal, handleCancelCheckpointDiscard, handleContinueAndRevert])

  return {
    // State
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts
@@ -2,23 +2,24 @@

 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import type { ChatContext, CopilotMessage, MessageFileAttachment } from '@/stores/panel'
+import type { CopilotMessage } from '@/stores/panel'
 import { useCopilotStore } from '@/stores/panel'

 const logger = createLogger('useMessageEditing')

-/** Ref interface for UserInput component */
-interface UserInputRef {
-  focus: () => void
-}
-
-/** Message truncation height in pixels */
+/**
+ * Message truncation height in pixels
+ */
 const MESSAGE_TRUNCATION_HEIGHT = 60

-/** Delay before attaching click-outside listener to avoid immediate trigger */
+/**
+ * Delay before attaching click-outside listener to avoid immediate trigger
+ */
 const CLICK_OUTSIDE_DELAY = 100

-/** Delay before aborting when editing during stream */
+/**
+ * Delay before aborting when editing during stream
+ */
 const ABORT_DELAY = 100

 interface UseMessageEditingProps {
@@ -31,8 +32,8 @@ interface UseMessageEditingProps {
  setShowCheckpointDiscardModal: (show: boolean) => void
  pendingEditRef: React.MutableRefObject<{
    message: string
-    fileAttachments?: MessageFileAttachment[]
-    contexts?: ChatContext[]
+    fileAttachments?: any[]
+    contexts?: any[]
  } | null>
  /**
   * When true, disables the internal document click-outside handler.
@@ -68,11 +69,13 @@ export function useMessageEditing(props: UseMessageEditingProps) {

  const editContainerRef = useRef<HTMLDivElement>(null)
  const messageContentRef = useRef<HTMLDivElement>(null)
-  const userInputRef = useRef<UserInputRef>(null)
+  const userInputRef = useRef<any>(null)

  const { sendMessage, isSendingMessage, abortMessage, currentChat } = useCopilotStore()

-  /** Checks if message content needs expansion based on height */
+  /**
+   * Checks if message content needs expansion based on height
+   */
  useEffect(() => {
    if (messageContentRef.current && message.role === 'user') {
      const scrollHeight = messageContentRef.current.scrollHeight
@@ -80,7 +83,9 @@ export function useMessageEditing(props: UseMessageEditingProps) {
    }
  }, [message.content, message.role])

-  /** Enters edit mode */
+  /**
+   * Handles entering edit mode
+   */
  const handleEditMessage = useCallback(() => {
    setIsEditMode(true)
    setIsExpanded(false)
@@ -92,14 +97,18 @@ export function useMessageEditing(props: UseMessageEditingProps) {
    }, 0)
  }, [message.content, onEditModeChange])

-  /** Cancels edit mode */
+  /**
+   * Handles canceling edit mode
+   */
  const handleCancelEdit = useCallback(() => {
    setIsEditMode(false)
    setEditedContent(message.content)
    onEditModeChange?.(false)
  }, [message.content, onEditModeChange])

-  /** Handles message click to enter edit mode */
+  /**
+   * Handles clicking on message to enter edit mode
+   */
  const handleMessageClick = useCallback(() => {
    if (needsExpansion && !isExpanded) {
      setIsExpanded(true)
@@ -107,13 +116,12 @@ export function useMessageEditing(props: UseMessageEditingProps) {
    handleEditMessage()
  }, [needsExpansion, isExpanded, handleEditMessage])

-  /** Performs the edit operation - truncates messages after edited message and resends */
+  /**
+   * Performs the actual edit operation
+   * Truncates messages after edited message and resends with same ID
+   */
  const performEdit = useCallback(
-    async (
-      editedMessage: string,
-      fileAttachments?: MessageFileAttachment[],
-      contexts?: ChatContext[]
-    ) => {
+    async (editedMessage: string, fileAttachments?: any[], contexts?: any[]) => {
      const currentMessages = messages
      const editIndex = currentMessages.findIndex((m) => m.id === message.id)

@@ -126,7 +134,7 @@ export function useMessageEditing(props: UseMessageEditingProps) {
          ...message,
          content: editedMessage,
          fileAttachments: fileAttachments || message.fileAttachments,
-          contexts: contexts || message.contexts,
+          contexts: contexts || (message as any).contexts,
        }

        useCopilotStore.setState({ messages: [...truncatedMessages, updatedMessage] })
@@ -145,7 +153,7 @@ export function useMessageEditing(props: UseMessageEditingProps) {
                  timestamp: m.timestamp,
                  ...(m.contentBlocks && { contentBlocks: m.contentBlocks }),
                  ...(m.fileAttachments && { fileAttachments: m.fileAttachments }),
-                  ...(m.contexts && { contexts: m.contexts }),
+                  ...((m as any).contexts && { contexts: (m as any).contexts }),
                })),
              }),
            })
@@ -156,7 +164,7 @@ export function useMessageEditing(props: UseMessageEditingProps) {

        await sendMessage(editedMessage, {
          fileAttachments: fileAttachments || message.fileAttachments,
-          contexts: contexts || message.contexts,
+          contexts: contexts || (message as any).contexts,
          messageId: message.id,
          queueIfBusy: false,
        })
@@ -165,13 +173,12 @@ export function useMessageEditing(props: UseMessageEditingProps) {
    [messages, message, currentChat, sendMessage, onEditModeChange]
  )

-  /** Submits edited message, checking for checkpoints first */
+  /**
+   * Handles submitting edited message
+   * Checks for checkpoints and shows confirmation if needed
+   */
  const handleSubmitEdit = useCallback(
-    async (
-      editedMessage: string,
-      fileAttachments?: MessageFileAttachment[],
-      contexts?: ChatContext[]
-    ) => {
+    async (editedMessage: string, fileAttachments?: any[], contexts?: any[]) => {
      if (!editedMessage.trim()) return

      if (isSendingMessage) {
@@ -197,7 +204,9 @@ export function useMessageEditing(props: UseMessageEditingProps) {
    ]
  )

-  /** Keyboard-only exit (Esc) */
+  /**
+   * Keyboard-only exit (Esc). Click-outside is optionally handled by parent.
+   */
  useEffect(() => {
    if (!isEditMode) return

@@ -213,7 +222,9 @@ export function useMessageEditing(props: UseMessageEditingProps) {
    }
  }, [isEditMode, handleCancelEdit])

-  /** Optional document-level click-outside handler */
+  /**
+   * Optional document-level click-outside handler (disabled when parent manages it).
+   */
  useEffect(() => {
    if (!isEditMode || disableDocumentClickOutside) return

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/index.ts
@@ -1 +0,0 @@
-export * from './copilot-message'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/index.ts
@@ -1,8 +1,7 @@
-export * from './chat-history-skeleton'
-export * from './copilot-message'
-export * from './plan-mode-section'
-export * from './queued-messages'
-export * from './todo-list'
-export * from './tool-call'
-export * from './user-input'
-export * from './welcome'
+export * from './copilot-message/copilot-message'
+export * from './plan-mode-section/plan-mode-section'
+export * from './queued-messages/queued-messages'
+export * from './todo-list/todo-list'
+export * from './tool-call/tool-call'
+export * from './user-input/user-input'
+export * from './welcome/welcome'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/plan-mode-section/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/plan-mode-section/index.ts
@@ -1 +0,0 @@
-export * from './plan-mode-section'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/plan-mode-section/plan-mode-section.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/plan-mode-section/plan-mode-section.tsx
@@ -29,7 +29,7 @@ import { Check, GripHorizontal, Pencil, X } from 'lucide-react'
 import { Button, Textarea } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
 import { cn } from '@/lib/core/utils/cn'
-import { CopilotMarkdownRenderer } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
+import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'

 /**
 * Shared border and background styles
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/queued-messages/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/queued-messages/index.ts
@@ -1 +0,0 @@
-export * from './queued-messages'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/queued-messages/queued-messages.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/queued-messages/queued-messages.tsx
@@ -31,22 +31,21 @@ export function QueuedMessages() {
  if (messageQueue.length === 0) return null

  return (
-    <div className='mx-[14px] overflow-hidden rounded-t-[4px] border border-[var(--border)] border-b-0 bg-[var(--bg-secondary)]'>
+    <div className='mx-2 overflow-hidden rounded-t-lg border border-black/[0.08] border-b-0 bg-[var(--bg-secondary)] dark:border-white/[0.08]'>
      {/* Header */}
      <button
        type='button'
        onClick={() => setIsExpanded(!isExpanded)}
-        className='flex w-full items-center justify-between px-[10px] py-[6px] transition-colors hover:bg-[var(--surface-3)]'
+        className='flex w-full items-center justify-between px-2.5 py-1.5 transition-colors hover:bg-[var(--bg-tertiary)]'
      >
-        <div className='flex items-center gap-[6px]'>
+        <div className='flex items-center gap-1.5'>
          {isExpanded ? (
-            <ChevronDown className='h-[14px] w-[14px] text-[var(--text-tertiary)]' />
+            <ChevronDown className='h-3 w-3 text-[var(--text-tertiary)]' />
          ) : (
-            <ChevronRight className='h-[14px] w-[14px] text-[var(--text-tertiary)]' />
+            <ChevronRight className='h-3 w-3 text-[var(--text-tertiary)]' />
          )}
-          <span className='font-medium text-[12px] text-[var(--text-primary)]'>Queued</span>
-          <span className='flex-shrink-0 font-medium text-[12px] text-[var(--text-tertiary)]'>
-            {messageQueue.length}
+          <span className='font-medium text-[var(--text-secondary)] text-xs'>
+            {messageQueue.length} Queued
          </span>
        </div>
      </button>
@@ -57,30 +56,30 @@ export function QueuedMessages() {
          {messageQueue.map((msg) => (
            <div
              key={msg.id}
-              className='group flex items-center gap-[8px] border-[var(--border)] border-t px-[10px] py-[6px] hover:bg-[var(--surface-3)]'
+              className='group flex items-center gap-2 border-black/[0.04] border-t px-2.5 py-1.5 hover:bg-[var(--bg-tertiary)] dark:border-white/[0.04]'
            >
              {/* Radio indicator */}
-              <div className='flex h-[14px] w-[14px] shrink-0 items-center justify-center'>
-                <div className='h-[10px] w-[10px] rounded-full border border-[var(--text-tertiary)]/50' />
+              <div className='flex h-3 w-3 shrink-0 items-center justify-center'>
+                <div className='h-2.5 w-2.5 rounded-full border border-[var(--text-tertiary)]/50' />
              </div>

              {/* Message content */}
              <div className='min-w-0 flex-1'>
-                <p className='truncate text-[13px] text-[var(--text-primary)]'>{msg.content}</p>
+                <p className='truncate text-[var(--text-primary)] text-xs'>{msg.content}</p>
              </div>

              {/* Actions - always visible */}
-              <div className='flex shrink-0 items-center gap-[4px]'>
+              <div className='flex shrink-0 items-center gap-0.5'>
                <button
                  type='button'
                  onClick={(e) => {
                    e.stopPropagation()
                    handleSendNow(msg.id)
                  }}
-                  className='rounded p-[3px] text-[var(--text-tertiary)] transition-colors hover:bg-[var(--bg-quaternary)] hover:text-[var(--text-primary)]'
+                  className='rounded p-0.5 text-[var(--text-tertiary)] transition-colors hover:bg-[var(--bg-quaternary)] hover:text-[var(--text-primary)]'
                  title='Send now (aborts current stream)'
                >
-                  <ArrowUp className='h-[14px] w-[14px]' />
+                  <ArrowUp className='h-3 w-3' />
                </button>
                <button
                  type='button'
@@ -88,10 +87,10 @@ export function QueuedMessages() {
                    e.stopPropagation()
                    handleRemove(msg.id)
                  }}
-                  className='rounded p-[3px] text-[var(--text-tertiary)] transition-colors hover:bg-red-500/10 hover:text-red-400'
+                  className='rounded p-0.5 text-[var(--text-tertiary)] transition-colors hover:bg-red-500/10 hover:text-red-400'
                  title='Remove from queue'
                >
-                  <Trash2 className='h-[14px] w-[14px]' />
+                  <Trash2 className='h-3 w-3' />
                </button>
              </div>
            </div>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/todo-list/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/todo-list/index.ts
@@ -1 +0,0 @@
-export * from './todo-list'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/index.ts
@@ -1 +0,0 @@
-export * from './tool-call'
--- 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
@@ -15,7 +15,7 @@ import {
  hasInterrupt as hasInterruptFromConfig,
  isSpecialTool as isSpecialToolFromConfig,
 } from '@/lib/copilot/tools/client/ui-config'
-import { CopilotMarkdownRenderer } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
+import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
 import { SmoothStreamingText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming'
 import { ThinkingBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block'
 import { getDisplayValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block'
@@ -26,30 +26,27 @@ import { CLASS_TOOL_METADATA } from '@/stores/panel/copilot/store'
 import type { SubAgentContentBlock } from '@/stores/panel/copilot/types'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'

-/** Plan step can be a string or an object with title and optional plan content */
+/**
+ * Plan step can be either a string or an object with title and plan
+ */
 type PlanStep = string | { title: string; plan?: string }

-/** Option can be a string or an object with title and optional description */
+/**
+ * Option can be either a string or an object with title and description
+ */
 type OptionItem = string | { title: string; description?: string }

-/** Result of parsing special XML tags from message content */
 interface ParsedTags {
-  /** Parsed plan steps, keyed by step number */
  plan?: Record<string, PlanStep>
-  /** Whether the plan tag is complete (has closing tag) */
  planComplete?: boolean
-  /** Parsed options, keyed by option number */
  options?: Record<string, OptionItem>
-  /** Whether the options tag is complete (has closing tag) */
  optionsComplete?: boolean
-  /** Content with special tags removed */
  cleanContent: string
 }

 /**
- * Extracts plan steps from plan_respond tool calls in subagent blocks.
- * @param blocks - The subagent content blocks to search
- * @returns Object containing steps in the format expected by PlanSteps component, and completion status
+ * Extract plan steps from plan_respond tool calls in subagent blocks.
+ * Returns { steps, isComplete } where steps is in the format expected by PlanSteps component.
 */
 function extractPlanFromBlocks(blocks: SubAgentContentBlock[] | undefined): {
  steps: Record<string, PlanStep> | undefined
@@ -57,6 +54,7 @@ function extractPlanFromBlocks(blocks: SubAgentContentBlock[] | undefined): {
 } {
  if (!blocks) return { steps: undefined, isComplete: false }

+  // Find the plan_respond tool call
  const planRespondBlock = blocks.find(
    (b) => b.type === 'subagent_tool_call' && b.toolCall?.name === 'plan_respond'
  )
@@ -65,6 +63,8 @@ function extractPlanFromBlocks(blocks: SubAgentContentBlock[] | undefined): {
    return { steps: undefined, isComplete: false }
  }

+  // Tool call arguments can be in different places depending on the source
+  // Also handle nested data.arguments structure from the schema
  const tc = planRespondBlock.toolCall as any
  const args = tc.params || tc.parameters || tc.input || tc.arguments || tc.data?.arguments || {}
  const stepsArray = args.steps
@@ -73,6 +73,9 @@ function extractPlanFromBlocks(blocks: SubAgentContentBlock[] | undefined): {
    return { steps: undefined, isComplete: false }
  }

+  // Convert array format to Record<string, PlanStep> format
+  // From: [{ number: 1, title: "..." }, { number: 2, title: "..." }]
+  // To: { "1": "...", "2": "..." }
  const steps: Record<string, PlanStep> = {}
  for (const step of stepsArray) {
    if (step.number !== undefined && step.title) {
@@ -80,6 +83,7 @@ function extractPlanFromBlocks(blocks: SubAgentContentBlock[] | undefined): {
    }
  }

+  // Check if the tool call is complete (not pending/executing)
  const isComplete =
    planRespondBlock.toolCall.state === ClientToolCallState.success ||
    planRespondBlock.toolCall.state === ClientToolCallState.error
@@ -91,9 +95,8 @@ function extractPlanFromBlocks(blocks: SubAgentContentBlock[] | undefined): {
 }

 /**
- * Parses partial JSON for streaming options, extracting complete key-value pairs from incomplete JSON.
- * @param jsonStr - The potentially incomplete JSON string
- * @returns Parsed options record or null if no valid options found
+ * Try to parse partial JSON for streaming options.
+ * Attempts to extract complete key-value pairs from incomplete JSON.
 */
 function parsePartialOptionsJson(jsonStr: string): Record<string, OptionItem> | null {
  // Try parsing as-is first (might be complete)
@@ -104,9 +107,8 @@ function parsePartialOptionsJson(jsonStr: string): Record<string, OptionItem> |
  }

  // Try to extract complete key-value pairs from partial JSON
-  // Match patterns like "1": "some text" or "1": {"title": "text", "description": "..."}
+  // Match patterns like "1": "some text" or "1": {"title": "text"}
  const result: Record<string, OptionItem> = {}
-
  // Match complete string values: "key": "value"
  const stringPattern = /"(\d+)":\s*"([^"]*?)"/g
  let match
@@ -114,24 +116,18 @@ function parsePartialOptionsJson(jsonStr: string): Record<string, OptionItem> |
    result[match[1]] = match[2]
  }

-  // Match complete object values with title and optional description
-  // Pattern matches: "1": {"title": "...", "description": "..."} or "1": {"title": "..."}
-  const objectPattern =
-    /"(\d+)":\s*\{\s*"title":\s*"((?:[^"\\]|\\.)*)"\s*(?:,\s*"description":\s*"((?:[^"\\]|\\.)*)")?\s*\}/g
+  // Match complete object values: "key": {"title": "value"}
+  const objectPattern = /"(\d+)":\s*\{[^}]*"title":\s*"([^"]*)"[^}]*\}/g
  while ((match = objectPattern.exec(jsonStr)) !== null) {
-    const key = match[1]
-    const title = match[2].replace(/\\"/g, '"').replace(/\\n/g, '\n')
-    const description = match[3]?.replace(/\\"/g, '"').replace(/\\n/g, '\n')
-    result[key] = description ? { title, description } : { title }
+    result[match[1]] = { title: match[2] }
  }

  return Object.keys(result).length > 0 ? result : null
 }

 /**
- * Parses partial JSON for streaming plan steps, extracting complete key-value pairs from incomplete JSON.
- * @param jsonStr - The potentially incomplete JSON string
- * @returns Parsed plan steps record or null if no valid steps found
+ * Try to parse partial JSON for streaming plan steps.
+ * Attempts to extract complete key-value pairs from incomplete JSON.
 */
 function parsePartialPlanJson(jsonStr: string): Record<string, PlanStep> | null {
  // Try parsing as-is first (might be complete)
@@ -163,10 +159,7 @@ function parsePartialPlanJson(jsonStr: string): Record<string, PlanStep> | null
 }

 /**
- * Parses special XML tags (`<plan>` and `<options>`) from message content.
- * Handles both complete and streaming/incomplete tags.
- * @param content - The message content to parse
- * @returns Parsed tags with plan, options, and clean content
+ * Parse <plan> and <options> tags from content
 */
 export function parseSpecialTags(content: string): ParsedTags {
  const result: ParsedTags = { cleanContent: content }
@@ -174,18 +167,12 @@ export function parseSpecialTags(content: string): ParsedTags {
  // Parse <plan> tag - check for complete tag first
  const planMatch = content.match(/<plan>([\s\S]*?)<\/plan>/i)
  if (planMatch) {
-    // Always strip the tag from display, even if JSON is invalid
-    result.cleanContent = result.cleanContent.replace(planMatch[0], '').trim()
    try {
      result.plan = JSON.parse(planMatch[1])
      result.planComplete = true
+      result.cleanContent = result.cleanContent.replace(planMatch[0], '').trim()
    } catch {
-      // JSON.parse failed - use regex fallback to extract plan from malformed JSON
-      const fallbackPlan = parsePartialPlanJson(planMatch[1])
-      if (fallbackPlan) {
-        result.plan = fallbackPlan
-        result.planComplete = true
-      }
+      // Invalid JSON, ignore
    }
  } else {
    // Check for streaming/incomplete plan tag
@@ -204,18 +191,12 @@ export function parseSpecialTags(content: string): ParsedTags {
  // Parse <options> tag - check for complete tag first
  const optionsMatch = content.match(/<options>([\s\S]*?)<\/options>/i)
  if (optionsMatch) {
-    // Always strip the tag from display, even if JSON is invalid
-    result.cleanContent = result.cleanContent.replace(optionsMatch[0], '').trim()
    try {
      result.options = JSON.parse(optionsMatch[1])
      result.optionsComplete = true
+      result.cleanContent = result.cleanContent.replace(optionsMatch[0], '').trim()
    } catch {
-      // JSON.parse failed - use regex fallback to extract options from malformed JSON
-      const fallbackOptions = parsePartialOptionsJson(optionsMatch[1])
-      if (fallbackOptions) {
-        result.options = fallbackOptions
-        result.optionsComplete = true
-      }
+      // Invalid JSON, ignore
    }
  } else {
    // Check for streaming/incomplete options tag
@@ -239,15 +220,15 @@ export function parseSpecialTags(content: string): ParsedTags {
 }

 /**
- * Renders workflow plan steps as a numbered to-do list.
- * @param steps - Plan steps keyed by step number
- * @param streaming - When true, uses smooth streaming animation for step titles
+ * PlanSteps component renders the workflow plan steps from the plan subagent
+ * Displays as a to-do list with checkmarks and strikethrough text
 */
 function PlanSteps({
  steps,
  streaming = false,
 }: {
  steps: Record<string, PlanStep>
+  /** When true, uses smooth streaming animation for step titles */
  streaming?: boolean
 }) {
  const sortedSteps = useMemo(() => {
@@ -268,7 +249,7 @@ function PlanSteps({
  if (sortedSteps.length === 0) return null

  return (
-    <div className='mt-0 overflow-hidden rounded-[6px] border border-[var(--border-1)] bg-[var(--surface-1)]'>
+    <div className='mt-1.5 overflow-hidden rounded-[6px] border border-[var(--border-1)] bg-[var(--surface-1)]'>
      <div className='flex items-center gap-[8px] border-[var(--border-1)] border-b bg-[var(--surface-2)] p-[8px]'>
        <LayoutList className='ml-[2px] h-3 w-3 flex-shrink-0 text-[var(--text-tertiary)]' />
        <span className='font-medium text-[12px] text-[var(--text-primary)]'>To-dos</span>
@@ -276,7 +257,7 @@ function PlanSteps({
          {sortedSteps.length}
        </span>
      </div>
-      <div className='flex flex-col gap-[6px] px-[10px] py-[6px]'>
+      <div className='flex flex-col gap-[6px] px-[10px] py-[8px]'>
        {sortedSteps.map(([num, title], index) => {
          const isLastStep = index === sortedSteps.length - 1
          return (
@@ -300,8 +281,9 @@ function PlanSteps({
 }

 /**
- * Renders selectable options from the agent with keyboard navigation and click selection.
- * After selection, shows the chosen option highlighted and others struck through.
+ * OptionsSelector component renders selectable options from the agent
+ * Supports keyboard navigation (arrow up/down, enter) and click selection
+ * After selection, shows the chosen option highlighted and others struck through
 */
 export function OptionsSelector({
  options,
@@ -309,7 +291,6 @@ export function OptionsSelector({
  disabled = false,
  enableKeyboardNav = false,
  streaming = false,
-  selectedOptionKey = null,
 }: {
  options: Record<string, OptionItem>
  onSelect: (optionKey: string, optionText: string) => void
@@ -318,8 +299,6 @@ export function OptionsSelector({
  enableKeyboardNav?: boolean
  /** When true, looks enabled but interaction is disabled (for streaming state) */
  streaming?: boolean
-  /** Pre-selected option key (for restoring selection from history) */
-  selectedOptionKey?: string | null
 }) {
  const isInteractionDisabled = disabled || streaming
  const sortedOptions = useMemo(() => {
@@ -337,8 +316,8 @@ export function OptionsSelector({
      })
  }, [options])

-  const [hoveredIndex, setHoveredIndex] = useState(-1)
-  const [chosenKey, setChosenKey] = useState<string | null>(selectedOptionKey)
+  const [hoveredIndex, setHoveredIndex] = useState(0)
+  const [chosenKey, setChosenKey] = useState<string | null>(null)
  const containerRef = useRef<HTMLDivElement>(null)

  const isLocked = chosenKey !== null
@@ -348,8 +327,7 @@ export function OptionsSelector({
    if (isInteractionDisabled || !enableKeyboardNav || isLocked) return

    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.defaultPrevented) return
-
+      // Only handle if the container or document body is focused (not when typing in input)
      const activeElement = document.activeElement
      const isInputFocused =
        activeElement?.tagName === 'INPUT' ||
@@ -360,14 +338,13 @@ export function OptionsSelector({

      if (e.key === 'ArrowDown') {
        e.preventDefault()
-        setHoveredIndex((prev) => (prev < 0 ? 0 : Math.min(prev + 1, sortedOptions.length - 1)))
+        setHoveredIndex((prev) => Math.min(prev + 1, sortedOptions.length - 1))
      } else if (e.key === 'ArrowUp') {
        e.preventDefault()
-        setHoveredIndex((prev) => (prev < 0 ? sortedOptions.length - 1 : Math.max(prev - 1, 0)))
+        setHoveredIndex((prev) => Math.max(prev - 1, 0))
      } else if (e.key === 'Enter') {
        e.preventDefault()
-        const indexToSelect = hoveredIndex < 0 ? 0 : hoveredIndex
-        const selected = sortedOptions[indexToSelect]
+        const selected = sortedOptions[hoveredIndex]
        if (selected) {
          setChosenKey(selected.key)
          onSelect(selected.key, selected.title)
@@ -391,7 +368,7 @@ export function OptionsSelector({
  if (sortedOptions.length === 0) return null

  return (
-    <div ref={containerRef} className='flex flex-col gap-[4px] pt-[4px]'>
+    <div ref={containerRef} className='flex flex-col gap-0.5 pb-0.5'>
      {sortedOptions.map((option, index) => {
        const isHovered = index === hoveredIndex && !isLocked
        const isChosen = option.key === chosenKey
@@ -409,9 +386,6 @@ export function OptionsSelector({
            onMouseEnter={() => {
              if (!isLocked && !streaming) setHoveredIndex(index)
            }}
-            onMouseLeave={() => {
-              if (!isLocked && !streaming && sortedOptions.length === 1) setHoveredIndex(-1)
-            }}
            className={clsx(
              'group flex cursor-pointer items-start gap-2 rounded-[6px] p-1',
              'hover:bg-[var(--surface-4)]',
@@ -447,31 +421,30 @@ export function OptionsSelector({
  )
 }

-/** Props for the ToolCall component */
 interface ToolCallProps {
-  /** Tool call data object */
  toolCall?: CopilotToolCall
-  /** Tool call ID for store lookup */
  toolCallId?: string
-  /** Callback when tool call state changes */
  onStateChange?: (state: any) => void
-  /** Whether this tool call is from the current/latest message. Controls shimmer and action buttons. */
-  isCurrentMessage?: boolean
 }

-/** Props for the ShimmerOverlayText component */
+/**
+ * Props for shimmer overlay text component.
+ */
 interface ShimmerOverlayTextProps {
-  /** Text content to display */
+  /** The text content to display */
  text: string
-  /** Whether shimmer animation is active */
+  /** Whether the shimmer animation is active */
  active?: boolean
  /** Additional class names for the wrapper */
  className?: string
-  /** Whether to use special gradient styling for important actions */
+  /** Whether to use special gradient styling (for important actions) */
  isSpecial?: boolean
 }

-/** Action verbs at the start of tool display names, highlighted for visual hierarchy */
+/**
+ * Action verbs that appear at the start of tool display names.
+ * These will be highlighted in a lighter color for better visual hierarchy.
+ */
 const ACTION_VERBS = [
  'Analyzing',
  'Analyzed',
@@ -579,8 +552,7 @@ const ACTION_VERBS = [

 /**
 * Splits text into action verb and remainder for two-tone rendering.
- * @param text - The text to split
- * @returns Tuple of [actionVerb, remainder] or [null, text] if no match
+ * Returns [actionVerb, remainder] or [null, text] if no match.
 */
 function splitActionVerb(text: string): [string | null, string] {
  for (const verb of ACTION_VERBS) {
@@ -600,9 +572,10 @@ function splitActionVerb(text: string): [string | null, string] {
 }

 /**
- * Renders text with a shimmer overlay animation when active.
- * Special tools use a gradient color; normal tools highlight action verbs.
- * Uses CSS truncation to clamp to one line with ellipsis.
+ * Renders text with a subtle white shimmer overlay when active, creating a skeleton-like
+ * loading effect that passes over the existing words without replacing them.
+ * For special tool calls, uses a gradient color. For normal tools, highlights action verbs
+ * in a lighter color with the rest in default gray.
 */
 const ShimmerOverlayText = memo(function ShimmerOverlayText({
  text,
@@ -612,13 +585,10 @@ const ShimmerOverlayText = memo(function ShimmerOverlayText({
 }: ShimmerOverlayTextProps) {
  const [actionVerb, remainder] = splitActionVerb(text)

-  // Base classes for single-line truncation with ellipsis
-  const truncateClasses = 'block w-full overflow-hidden text-ellipsis whitespace-nowrap'
-
  // Special tools: use tertiary-2 color for entire text with shimmer
  if (isSpecial) {
    return (
-      <span className={`relative ${truncateClasses} ${className || ''}`}>
+      <span className={`relative inline-block ${className || ''}`}>
        <span className='text-[var(--brand-tertiary-2)]'>{text}</span>
        {active ? (
          <span
@@ -626,7 +596,7 @@ const ShimmerOverlayText = memo(function ShimmerOverlayText({
            className='pointer-events-none absolute inset-0 select-none overflow-hidden'
          >
            <span
-              className='block overflow-hidden text-ellipsis whitespace-nowrap text-transparent'
+              className='block text-transparent'
              style={{
                backgroundImage:
                  'linear-gradient(90deg, rgba(51,196,129,0) 0%, rgba(255,255,255,0.6) 50%, rgba(51,196,129,0) 100%)',
@@ -657,7 +627,7 @@ const ShimmerOverlayText = memo(function ShimmerOverlayText({
  // Light mode: primary (#2d2d2d) vs muted (#737373) for good contrast
  // Dark mode: tertiary (#b3b3b3) vs muted (#787878) for good contrast
  return (
-    <span className={`relative ${truncateClasses} ${className || ''}`}>
+    <span className={`relative inline-block ${className || ''}`}>
      {actionVerb ? (
        <>
          <span className='text-[var(--text-primary)] dark:text-[var(--text-tertiary)]'>
@@ -674,7 +644,7 @@ const ShimmerOverlayText = memo(function ShimmerOverlayText({
          className='pointer-events-none absolute inset-0 select-none overflow-hidden'
        >
          <span
-            className='block overflow-hidden text-ellipsis whitespace-nowrap text-transparent'
+            className='block text-transparent'
            style={{
              backgroundImage:
                'linear-gradient(90deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.85) 50%, rgba(255,255,255,0) 100%)',
@@ -702,9 +672,8 @@ const ShimmerOverlayText = memo(function ShimmerOverlayText({
 })

 /**
- * Gets the collapse header label for completed subagent tools.
- * @param toolName - The tool name to get the label for
- * @returns The completion label from UI config, defaults to 'Thought'
+ * Get the outer collapse header label for completed subagent tools.
+ * Uses the tool's UI config.
 */
 function getSubagentCompletionLabel(toolName: string): string {
  const labels = getSubagentLabelsFromConfig(toolName, false)
@@ -712,9 +681,8 @@ function getSubagentCompletionLabel(toolName: string): string {
 }

 /**
- * Renders subagent blocks as thinking text within regular tool calls.
- * @param blocks - The subagent content blocks to render
- * @param isStreaming - Whether streaming animations should be shown (caller should pre-compute currentMessage check)
+ * SubAgentThinkingContent renders subagent blocks as simple thinking text (ThinkingBlock).
+ * Used for inline rendering within regular tool calls that have subagent content.
 */
 function SubAgentThinkingContent({
  blocks,
@@ -749,7 +717,7 @@ function SubAgentThinkingContent({
  const hasSpecialTags = hasPlan

  return (
-    <div className='space-y-[4px]'>
+    <div className='space-y-1.5'>
      {cleanText.trim() && (
        <ThinkingBlock
          content={cleanText}
@@ -763,29 +731,32 @@ function SubAgentThinkingContent({
  )
 }

-/** Subagents that collapse into summary headers when done streaming */
+/**
+ * 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.
+ */
 const COLLAPSIBLE_SUBAGENTS = new Set(['plan', 'debug', 'research'])

 /**
- * Handles rendering of subagent content with streaming and collapse behavior.
+ * SubagentContentRenderer handles the rendering of subagent content.
+ * - During streaming: Shows content at top level
+ * - When done (not streaming): Most subagents stay expanded, only specific ones collapse
+ * - Exception: plan, debug, research, info subagents collapse into a header
 */
 const SubagentContentRenderer = memo(function SubagentContentRenderer({
  toolCall,
  shouldCollapse,
-  isCurrentMessage = true,
 }: {
  toolCall: CopilotToolCall
  shouldCollapse: boolean
-  /** Whether this is from the current/latest message. Controls shimmer animations. */
-  isCurrentMessage?: boolean
 }) {
  const [isExpanded, setIsExpanded] = useState(true)
  const [duration, setDuration] = useState(0)
  const startTimeRef = useRef<number>(Date.now())
  const wasStreamingRef = useRef(false)

-  // Only show streaming animations for current message
-  const isStreaming = isCurrentMessage && !!toolCall.subAgentStreaming
+  const isStreaming = !!toolCall.subAgentStreaming

  useEffect(() => {
    if (isStreaming && !wasStreamingRef.current) {
@@ -879,11 +850,7 @@ const SubagentContentRenderer = memo(function SubagentContentRenderer({
          }
          return (
            <div key={`tool-${segment.block.toolCall.id || index}`}>
-              <ToolCall
-                toolCallId={segment.block.toolCall.id}
-                toolCall={segment.block.toolCall}
-                isCurrentMessage={isCurrentMessage}
-              />
+              <ToolCall toolCallId={segment.block.toolCall.id} toolCall={segment.block.toolCall} />
            </div>
          )
        }
@@ -894,7 +861,7 @@ const SubagentContentRenderer = memo(function SubagentContentRenderer({

  if (isStreaming || !shouldCollapse) {
    return (
-      <div className='w-full space-y-[4px]'>
+      <div className='w-full space-y-1.5'>
        {renderCollapsibleContent()}
        {hasPlan && planToRender && <PlanSteps steps={planToRender} streaming={isPlanStreaming} />}
      </div>
@@ -921,30 +888,30 @@ const SubagentContentRenderer = memo(function SubagentContentRenderer({
      <div
        className={clsx(
          'overflow-hidden transition-all duration-150 ease-out',
-          isExpanded ? 'mt-1.5 max-h-[5000px] space-y-[4px] opacity-100' : 'max-h-0 opacity-0'
+          isExpanded ? 'mt-1.5 max-h-[5000px] opacity-100' : 'max-h-0 opacity-0'
        )}
      >
        {renderCollapsibleContent()}
      </div>

-      {hasPlan && planToRender && (
-        <div className='mt-[6px]'>
-          <PlanSteps steps={planToRender} />
-        </div>
-      )}
+      {/* Plan stays outside the collapsible */}
+      {hasPlan && planToRender && <PlanSteps steps={planToRender} />}
    </div>
  )
 })

 /**
- * Determines if a tool call should display with special gradient styling.
+ * Determines if a tool call is "special" and should display with gradient styling.
+ * Uses the tool's UI config.
 */
 function isSpecialToolCall(toolCall: CopilotToolCall): boolean {
  return isSpecialToolFromConfig(toolCall.name)
 }

 /**
- * Displays a summary of workflow edits with added, edited, and deleted blocks.
+ * WorkflowEditSummary shows a full-width summary of workflow edits (like Cursor's diff).
+ * Displays: workflow name with stats (+N green, N orange, -N red)
+ * Expands inline on click to show individual blocks with their icons.
 */
 const WorkflowEditSummary = memo(function WorkflowEditSummary({
  toolCall,
@@ -1202,7 +1169,9 @@ const WorkflowEditSummary = memo(function WorkflowEditSummary({
  )
 })

-/** Checks if a tool is server-side executed (not a client tool) */
+/**
+ * Checks if a tool is an integration tool (server-side executed, not a client tool)
+ */
 function isIntegrationTool(toolName: string): boolean {
  return !CLASS_TOOL_METADATA[toolName]
 }
@@ -1348,7 +1317,9 @@ function getDisplayName(toolCall: CopilotToolCall): string {
  return `${stateVerb} ${formattedName}`
 }

-/** Gets verb prefix based on tool call state */
+/**
+ * Get verb prefix based on tool state
+ */
 function getStateVerb(state: string): string {
  switch (state) {
    case 'pending':
@@ -1367,7 +1338,8 @@ function getStateVerb(state: string): string {
 }

 /**
- * Formats tool name for display (e.g., "google_calendar_list_events" -> "Google Calendar List Events")
+ * Format tool name for display
+ * e.g., "google_calendar_list_events" -> "Google Calendar List Events"
 */
 function formatToolName(name: string): string {
  const baseName = name.replace(/_v\d+$/, '')
@@ -1443,7 +1415,7 @@ function RunSkipButtons({

  // Standardized buttons for all interrupt tools: Allow, (Always Allow for client tools only), Skip
  return (
-    <div className='mt-[10px] flex gap-[6px]'>
+    <div className='mt-1.5 flex gap-[6px]'>
      <Button onClick={onRun} disabled={isProcessing} variant='tertiary'>
        {isProcessing ? 'Allowing...' : 'Allow'}
      </Button>
@@ -1459,12 +1431,7 @@ function RunSkipButtons({
  )
 }

-export function ToolCall({
-  toolCall: toolCallProp,
-  toolCallId,
-  onStateChange,
-  isCurrentMessage = true,
-}: ToolCallProps) {
+export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }: ToolCallProps) {
  const [, forceUpdate] = useState({})
  // Get live toolCall from store to ensure we have the latest state
  const effectiveId = toolCallId || toolCallProp?.id
@@ -1478,7 +1445,9 @@ export function ToolCall({

  const isExpandablePending =
    toolCall?.state === 'pending' &&
-    (toolCall.name === 'make_api_request' || toolCall.name === 'set_global_workflow_variables')
+    (toolCall.name === 'make_api_request' ||
+      toolCall.name === 'set_global_workflow_variables' ||
+      toolCall.name === 'run_workflow')

  const [expanded, setExpanded] = useState(isExpandablePending)
  const [showRemoveAutoAllow, setShowRemoveAutoAllow] = useState(false)
@@ -1553,7 +1522,6 @@ export function ToolCall({
      <SubagentContentRenderer
        toolCall={toolCall}
        shouldCollapse={COLLAPSIBLE_SUBAGENTS.has(toolCall.name)}
-        isCurrentMessage={isCurrentMessage}
      />
    )
  }
@@ -1582,34 +1550,37 @@ export function ToolCall({
  }
  // Check if tool has params table config (meaning it's expandable)
  const hasParamsTable = !!getToolUIConfig(toolCall.name)?.paramsTable
-  const isRunWorkflow = toolCall.name === 'run_workflow'
  const isExpandableTool =
    hasParamsTable ||
    toolCall.name === 'make_api_request' ||
-    toolCall.name === 'set_global_workflow_variables'
+    toolCall.name === 'set_global_workflow_variables' ||
+    toolCall.name === 'run_workflow'

-  const showButtons = isCurrentMessage && shouldShowRunSkipButtons(toolCall)
+  const showButtons = shouldShowRunSkipButtons(toolCall)

-  // Check UI config for secondary action - only show for current message tool calls
+  // Check UI config for secondary action
  const toolUIConfig = getToolUIConfig(toolCall.name)
  const secondaryAction = toolUIConfig?.secondaryAction
  const showSecondaryAction = secondaryAction?.showInStates.includes(
    toolCall.state as ClientToolCallState
  )
-  const isExecuting =
-    toolCall.state === (ClientToolCallState.executing as any) ||
-    toolCall.state === ('executing' as any)

  // Legacy fallbacks for tools that haven't migrated to UI config
  const showMoveToBackground =
-    isCurrentMessage &&
-    ((showSecondaryAction && secondaryAction?.text === 'Move to Background') ||
-      (!secondaryAction && toolCall.name === 'run_workflow' && isExecuting))
+    showSecondaryAction && secondaryAction?.text === 'Move to Background'
+      ? true
+      : !secondaryAction &&
+        toolCall.name === 'run_workflow' &&
+        (toolCall.state === (ClientToolCallState.executing as any) ||
+          toolCall.state === ('executing' as any))

  const showWake =
-    isCurrentMessage &&
-    ((showSecondaryAction && secondaryAction?.text === 'Wake') ||
-      (!secondaryAction && toolCall.name === 'sleep' && isExecuting))
+    showSecondaryAction && secondaryAction?.text === 'Wake'
+      ? true
+      : !secondaryAction &&
+        toolCall.name === 'sleep' &&
+        (toolCall.state === (ClientToolCallState.executing as any) ||
+          toolCall.state === ('executing' as any))

  const handleStateChange = (state: any) => {
    forceUpdate({})
@@ -1623,8 +1594,6 @@ export function ToolCall({
    toolCall.state === ClientToolCallState.pending ||
    toolCall.state === ClientToolCallState.executing

-  const shouldShowShimmer = isCurrentMessage && isLoadingState
-
  const isSpecial = isSpecialToolCall(toolCall)

  const renderPendingDetails = () => {
@@ -1934,7 +1903,7 @@ export function ToolCall({
            </span>
          </div>
          {/* Input entries */}
-          <div className='flex flex-col pt-[6px]'>
+          <div className='flex flex-col'>
            {inputEntries.map(([key, value], index) => {
              const isComplex = isComplexValue(value)
              const displayValue = formatValueForDisplay(value)
@@ -1943,8 +1912,8 @@ export function ToolCall({
                <div
                  key={key}
                  className={clsx(
-                    'flex flex-col gap-[6px] px-[10px] pb-[6px]',
-                    index > 0 && 'mt-[6px] border-[var(--border-1)] border-t pt-[6px]'
+                    'flex flex-col gap-1.5 px-[10px] py-[8px]',
+                    index > 0 && 'border-[var(--border-1)] border-t'
                  )}
                >
                  {/* Input key */}
@@ -2036,14 +2005,14 @@ export function ToolCall({
        <div className={isEnvVarsClickable ? 'cursor-pointer' : ''} onClick={handleEnvVarsClick}>
          <ShimmerOverlayText
            text={displayName}
-            active={shouldShowShimmer}
+            active={isLoadingState}
            isSpecial={isSpecial}
            className='font-[470] font-season text-[var(--text-secondary)] text-sm dark:text-[var(--text-muted)]'
          />
        </div>
-        <div className='mt-[10px]'>{renderPendingDetails()}</div>
+        <div className='mt-1.5'>{renderPendingDetails()}</div>
        {showRemoveAutoAllow && isAutoAllowed && (
-          <div className='mt-[10px]'>
+          <div className='mt-1.5'>
            <Button
              onClick={async () => {
                await removeAutoAllowedTool(toolCall.name)
@@ -2068,7 +2037,7 @@ export function ToolCall({
        {toolCall.subAgentBlocks && toolCall.subAgentBlocks.length > 0 && (
          <SubAgentThinkingContent
            blocks={toolCall.subAgentBlocks}
-            isStreaming={isCurrentMessage && toolCall.subAgentStreaming}
+            isStreaming={toolCall.subAgentStreaming}
          />
        )}
      </div>
@@ -2093,18 +2062,18 @@ export function ToolCall({
        >
          <ShimmerOverlayText
            text={displayName}
-            active={shouldShowShimmer}
+            active={isLoadingState}
            isSpecial={isSpecial}
            className='font-[470] font-season text-[var(--text-secondary)] text-sm dark:text-[var(--text-muted)]'
          />
        </div>
        {code && (
-          <div className='mt-[10px]'>
+          <div className='mt-1.5'>
            <Code.Viewer code={code} language='javascript' showGutter className='min-h-0' />
          </div>
        )}
        {showRemoveAutoAllow && isAutoAllowed && (
-          <div className='mt-[10px]'>
+          <div className='mt-1.5'>
            <Button
              onClick={async () => {
                await removeAutoAllowedTool(toolCall.name)
@@ -2129,14 +2098,14 @@ export function ToolCall({
        {toolCall.subAgentBlocks && toolCall.subAgentBlocks.length > 0 && (
          <SubAgentThinkingContent
            blocks={toolCall.subAgentBlocks}
-            isStreaming={isCurrentMessage && toolCall.subAgentStreaming}
+            isStreaming={toolCall.subAgentStreaming}
          />
        )}
      </div>
    )
  }

-  const isToolNameClickable = (!isRunWorkflow && isExpandableTool) || isAutoAllowed
+  const isToolNameClickable = isExpandableTool || isAutoAllowed

  const handleToolNameClick = () => {
    if (isExpandableTool) {
@@ -2147,7 +2116,6 @@ export function ToolCall({
  }

  const isEditWorkflow = toolCall.name === 'edit_workflow'
-  const shouldShowDetails = isRunWorkflow || (isExpandableTool && expanded)
  const hasOperations = Array.isArray(params.operations) && params.operations.length > 0
  const hideTextForEditWorkflow = isEditWorkflow && hasOperations

@@ -2157,15 +2125,15 @@ export function ToolCall({
        <div className={isToolNameClickable ? 'cursor-pointer' : ''} onClick={handleToolNameClick}>
          <ShimmerOverlayText
            text={displayName}
-            active={shouldShowShimmer}
+            active={isLoadingState}
            isSpecial={isSpecial}
            className='font-[470] font-season text-[var(--text-secondary)] text-sm dark:text-[var(--text-muted)]'
          />
        </div>
      )}
-      {shouldShowDetails && <div className='mt-[10px]'>{renderPendingDetails()}</div>}
+      {isExpandableTool && expanded && <div className='mt-1.5'>{renderPendingDetails()}</div>}
      {showRemoveAutoAllow && isAutoAllowed && (
-        <div className='mt-[10px]'>
+        <div className='mt-1.5'>
          <Button
            onClick={async () => {
              await removeAutoAllowedTool(toolCall.name)
@@ -2186,7 +2154,7 @@ export function ToolCall({
          editedParams={editedParams}
        />
      ) : showMoveToBackground ? (
-        <div className='mt-[10px]'>
+        <div className='mt-1.5'>
          <Button
            onClick={async () => {
              try {
@@ -2207,7 +2175,7 @@ export function ToolCall({
          </Button>
        </div>
      ) : showWake ? (
-        <div className='mt-[10px]'>
+        <div className='mt-1.5'>
          <Button
            onClick={async () => {
              try {
@@ -2240,7 +2208,7 @@ export function ToolCall({
      {toolCall.subAgentBlocks && toolCall.subAgentBlocks.length > 0 && (
        <SubAgentThinkingContent
          blocks={toolCall.subAgentBlocks}
-          isStreaming={isCurrentMessage && toolCall.subAgentStreaming}
+          isStreaming={toolCall.subAgentStreaming}
        />
      )}
    </div>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/attached-files-display/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/attached-files-display/index.ts
@@ -1 +0,0 @@
-export * from './attached-files-display'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/bottom-controls/bottom-controls.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/bottom-controls/bottom-controls.tsx
@@ -1,127 +0,0 @@
-'use client'
-
-import { ArrowUp, Image, Loader2 } from 'lucide-react'
-import { Badge, Button } from '@/components/emcn'
-import { cn } from '@/lib/core/utils/cn'
-import { ModeSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mode-selector/mode-selector'
-import { ModelSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/model-selector/model-selector'
-
-interface BottomControlsProps {
-  mode: 'ask' | 'build' | 'plan'
-  onModeChange?: (mode: 'ask' | 'build' | 'plan') => void
-  selectedModel: string
-  onModelSelect: (model: string) => void
-  isNearTop: boolean
-  disabled: boolean
-  hideModeSelector: boolean
-  canSubmit: boolean
-  isLoading: boolean
-  isAborting: boolean
-  showAbortButton: boolean
-  onSubmit: () => void
-  onAbort: () => void
-  onFileSelect: () => void
-}
-
-/**
- * Bottom controls section of the user input
- * Contains mode selector, model selector, file attachment button, and submit/abort buttons
- */
-export function BottomControls({
-  mode,
-  onModeChange,
-  selectedModel,
-  onModelSelect,
-  isNearTop,
-  disabled,
-  hideModeSelector,
-  canSubmit,
-  isLoading,
-  isAborting,
-  showAbortButton,
-  onSubmit,
-  onAbort,
-  onFileSelect,
-}: BottomControlsProps) {
-  return (
-    <div className='flex items-center justify-between gap-2'>
-      {/* Left side: Mode Selector + Model Selector */}
-      <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
-        {!hideModeSelector && (
-          <ModeSelector
-            mode={mode}
-            onModeChange={onModeChange}
-            isNearTop={isNearTop}
-            disabled={disabled}
-          />
-        )}
-
-        <ModelSelector
-          selectedModel={selectedModel}
-          isNearTop={isNearTop}
-          onModelSelect={onModelSelect}
-        />
-      </div>
-
-      {/* Right side: Attach Button + Send Button */}
-      <div className='flex flex-shrink-0 items-center gap-[10px]'>
-        <Badge
-          onClick={onFileSelect}
-          title='Attach file'
-          className={cn(
-            'cursor-pointer rounded-[6px] border-0 bg-transparent p-[0px] dark:bg-transparent',
-            disabled && 'cursor-not-allowed opacity-50'
-          )}
-        >
-          <Image className='!h-3.5 !w-3.5 scale-x-110' />
-        </Badge>
-
-        {showAbortButton ? (
-          <Button
-            onClick={onAbort}
-            disabled={isAborting}
-            className={cn(
-              'h-[20px] w-[20px] rounded-full border-0 p-0 transition-colors',
-              !isAborting
-                ? 'bg-[var(--c-383838)] hover:bg-[var(--c-575757)] dark:bg-[var(--c-E0E0E0)] dark:hover:bg-[var(--c-CFCFCF)]'
-                : 'bg-[var(--c-383838)] dark:bg-[var(--c-E0E0E0)]'
-            )}
-            title='Stop generation'
-          >
-            {isAborting ? (
-              <Loader2 className='block h-[13px] w-[13px] animate-spin text-white dark:text-black' />
-            ) : (
-              <svg
-                className='block h-[13px] w-[13px] fill-white dark:fill-black'
-                viewBox='0 0 24 24'
-                xmlns='http://www.w3.org/2000/svg'
-              >
-                <rect x='4' y='4' width='16' height='16' rx='3' ry='3' />
-              </svg>
-            )}
-          </Button>
-        ) : (
-          <Button
-            onClick={onSubmit}
-            disabled={!canSubmit}
-            className={cn(
-              'h-[22px] w-[22px] rounded-full border-0 p-0 transition-colors',
-              canSubmit
-                ? 'bg-[var(--c-383838)] hover:bg-[var(--c-575757)] dark:bg-[var(--c-E0E0E0)] dark:hover:bg-[var(--c-CFCFCF)]'
-                : 'bg-[var(--c-808080)] dark:bg-[var(--c-808080)]'
-            )}
-          >
-            {isLoading ? (
-              <Loader2 className='block h-3.5 w-3.5 animate-spin text-white dark:text-black' />
-            ) : (
-              <ArrowUp
-                className='block h-3.5 w-3.5 text-white dark:text-black'
-                strokeWidth={2.25}
-              />
-            )}
-          </Button>
-        )}
-      </div>
-    </div>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/bottom-controls/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/bottom-controls/index.ts
@@ -1 +0,0 @@
-export * from './bottom-controls'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/context-pills/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/context-pills/index.ts
@@ -1 +0,0 @@
-export * from './context-pills'
--- 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
@@ -1,7 +1,6 @@
-export { AttachedFilesDisplay } from './attached-files-display'
-export { BottomControls } from './bottom-controls'
-export { ContextPills } from './context-pills'
-export { type MentionFolderNav, MentionMenu } from './mention-menu'
-export { ModeSelector } from './mode-selector'
-export { ModelSelector } from './model-selector'
-export { type SlashFolderNav, SlashMenu } from './slash-menu'
+export { AttachedFilesDisplay } from './attached-files-display/attached-files-display'
+export { ContextPills } from './context-pills/context-pills'
+export { type MentionFolderNav, MentionMenu } from './mention-menu/mention-menu'
+export { ModeSelector } from './mode-selector/mode-selector'
+export { ModelSelector } from './model-selector/model-selector'
+export { type SlashFolderNav, SlashMenu } from './slash-menu/slash-menu'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mention-menu/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mention-menu/index.ts
@@ -1 +0,0 @@
-export * from './mention-menu'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mode-selector/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mode-selector/index.ts
@@ -1 +0,0 @@
-export * from './mode-selector'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/model-selector/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/model-selector/index.ts
@@ -1 +0,0 @@
-export * from './model-selector'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/slash-menu/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/slash-menu/index.ts
@@ -1 +0,0 @@
-export * from './slash-menu'
--- 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,6 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import {
-  escapeRegex,
  filterOutContext,
  isContextAlreadySelected,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
@@ -23,6 +22,9 @@ interface UseContextManagementProps {
 export function useContextManagement({ message, initialContexts }: UseContextManagementProps) {
  const [selectedContexts, setSelectedContexts] = useState<ChatContext[]>(initialContexts ?? [])
  const initializedRef = useRef(false)
+  const escapeRegex = useCallback((value: string) => {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  }, [])

  // Initialize with initial contexts when they're first provided (for edit mode)
  useEffect(() => {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/index.ts
@@ -1 +0,0 @@
-export * from './user-input'
--- 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
@@ -9,19 +9,19 @@ import {
  useState,
 } from 'react'
 import { createLogger } from '@sim/logger'
-import { AtSign } from 'lucide-react'
+import { ArrowUp, AtSign, Image, Loader2 } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import { createPortal } from 'react-dom'
 import { Badge, Button, Textarea } from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
-import type { CopilotModelId } from '@/lib/copilot/models'
 import { cn } from '@/lib/core/utils/cn'
 import {
  AttachedFilesDisplay,
-  BottomControls,
  ContextPills,
  type MentionFolderNav,
  MentionMenu,
+  ModelSelector,
+  ModeSelector,
  type SlashFolderNav,
  SlashMenu,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components'
@@ -44,10 +44,6 @@ import {
  useTextareaAutoResize,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks'
 import type { MessageFileAttachment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
-import {
-  computeMentionHighlightRanges,
-  extractContextTokens,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
 import type { ChatContext } from '@/stores/panel'
 import { useCopilotStore } from '@/stores/panel'

@@ -267,6 +263,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(

      if (q && q.length > 0) {
        void mentionData.ensurePastChatsLoaded()
+        // workflows and workflow-blocks auto-load from stores
        void mentionData.ensureKnowledgeLoaded()
        void mentionData.ensureBlocksLoaded()
        void mentionData.ensureTemplatesLoaded()
@@ -309,7 +306,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
            size: f.size,
          }))

-        onSubmit(trimmedMessage, fileAttachmentsForApi, contextManagement.selectedContexts)
+        onSubmit(trimmedMessage, fileAttachmentsForApi, contextManagement.selectedContexts as any)

        const shouldClearInput = clearOnSubmit && !options.preserveInput && !overrideMessage
        if (shouldClearInput) {
@@ -660,7 +657,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(

    const handleModelSelect = useCallback(
      (model: string) => {
-        setSelectedModel(model as CopilotModelId)
+        setSelectedModel(model as any)
      },
      [setSelectedModel]
    )
@@ -680,17 +677,15 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
        return <span>{displayText}</span>
      }

-      const tokens = extractContextTokens(contexts)
-      const ranges = computeMentionHighlightRanges(message, tokens)
+      const elements: React.ReactNode[] = []
+      const ranges = mentionTokensWithContext.computeMentionRanges()

      if (ranges.length === 0) {
        const displayText = message.endsWith('\n') ? `${message}\u200B` : message
        return <span>{displayText}</span>
      }

-      const elements: React.ReactNode[] = []
      let lastIndex = 0
-
      for (let i = 0; i < ranges.length; i++) {
        const range = ranges[i]

@@ -699,12 +694,13 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
          elements.push(<span key={`text-${i}-${lastIndex}-${range.start}`}>{before}</span>)
        }

+        const mentionText = message.slice(range.start, range.end)
        elements.push(
          <span
            key={`mention-${i}-${range.start}-${range.end}`}
            className='rounded-[4px] bg-[rgba(50,189,126,0.65)] py-[1px]'
          >
-            {range.token}
+            {mentionText}
          </span>
        )
        lastIndex = range.end
@@ -717,7 +713,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
      }

      return elements.length > 0 ? elements : <span>{'\u00A0'}</span>
-    }, [message, contextManagement.selectedContexts])
+    }, [message, contextManagement.selectedContexts, mentionTokensWithContext])

    return (
      <div
@@ -859,22 +855,87 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
          </div>

          {/* Bottom Row: Mode Selector + Model Selector + Attach Button + Send Button */}
-          <BottomControls
-            mode={mode}
-            onModeChange={onModeChange}
-            selectedModel={selectedModel}
-            onModelSelect={handleModelSelect}
-            isNearTop={isNearTop}
-            disabled={disabled}
-            hideModeSelector={hideModeSelector}
-            canSubmit={canSubmit}
-            isLoading={isLoading}
-            isAborting={isAborting}
-            showAbortButton={Boolean(showAbortButton)}
-            onSubmit={() => void handleSubmit()}
-            onAbort={handleAbort}
-            onFileSelect={fileAttachments.handleFileSelect}
-          />
+          <div className='flex items-center justify-between gap-2'>
+            {/* Left side: Mode Selector + Model Selector */}
+            <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
+              {!hideModeSelector && (
+                <ModeSelector
+                  mode={mode}
+                  onModeChange={onModeChange}
+                  isNearTop={isNearTop}
+                  disabled={disabled}
+                />
+              )}
+
+              <ModelSelector
+                selectedModel={selectedModel}
+                isNearTop={isNearTop}
+                onModelSelect={handleModelSelect}
+              />
+            </div>
+
+            {/* Right side: Attach Button + Send Button */}
+            <div className='flex flex-shrink-0 items-center gap-[10px]'>
+              <Badge
+                onClick={fileAttachments.handleFileSelect}
+                title='Attach file'
+                className={cn(
+                  'cursor-pointer rounded-[6px] border-0 bg-transparent p-[0px] dark:bg-transparent',
+                  disabled && 'cursor-not-allowed opacity-50'
+                )}
+              >
+                <Image className='!h-3.5 !w-3.5 scale-x-110' />
+              </Badge>
+
+              {showAbortButton ? (
+                <Button
+                  onClick={handleAbort}
+                  disabled={isAborting}
+                  className={cn(
+                    'h-[20px] w-[20px] rounded-full border-0 p-0 transition-colors',
+                    !isAborting
+                      ? 'bg-[var(--c-383838)] hover:bg-[var(--c-575757)] dark:bg-[var(--c-E0E0E0)] dark:hover:bg-[var(--c-CFCFCF)]'
+                      : 'bg-[var(--c-383838)] dark:bg-[var(--c-E0E0E0)]'
+                  )}
+                  title='Stop generation'
+                >
+                  {isAborting ? (
+                    <Loader2 className='block h-[13px] w-[13px] animate-spin text-white dark:text-black' />
+                  ) : (
+                    <svg
+                      className='block h-[13px] w-[13px] fill-white dark:fill-black'
+                      viewBox='0 0 24 24'
+                      xmlns='http://www.w3.org/2000/svg'
+                    >
+                      <rect x='4' y='4' width='16' height='16' rx='3' ry='3' />
+                    </svg>
+                  )}
+                </Button>
+              ) : (
+                <Button
+                  onClick={() => {
+                    void handleSubmit()
+                  }}
+                  disabled={!canSubmit}
+                  className={cn(
+                    'h-[22px] w-[22px] rounded-full border-0 p-0 transition-colors',
+                    canSubmit
+                      ? 'bg-[var(--c-383838)] hover:bg-[var(--c-575757)] dark:bg-[var(--c-E0E0E0)] dark:hover:bg-[var(--c-CFCFCF)]'
+                      : 'bg-[var(--c-808080)] dark:bg-[var(--c-808080)]'
+                  )}
+                >
+                  {isLoading ? (
+                    <Loader2 className='block h-3.5 w-3.5 animate-spin text-white dark:text-black' />
+                  ) : (
+                    <ArrowUp
+                      className='block h-3.5 w-3.5 text-white dark:text-black'
+                      strokeWidth={2.25}
+                    />
+                  )}
+                </Button>
+              )}
+            </div>
+          </div>

          {/* Hidden File Input - enabled during streaming so users can prepare images for the next message */}
          <input
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
@@ -1,4 +1,3 @@
-import type { ReactNode } from 'react'
 import {
  FOLDER_CONFIGS,
  type MentionFolderId,
@@ -6,102 +5,6 @@ import {
 import type { MentionDataReturn } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data'
 import type { ChatContext } from '@/stores/panel'

-/**
- * Escapes special regex characters in a string
- * @param value - String to escape
- * @returns Escaped string safe for use in RegExp
- */
-export function escapeRegex(value: string): string {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-/**
- * Extracts mention tokens from contexts for display/matching
- * Filters out current_workflow contexts and builds prefixed labels
- * @param contexts - Array of chat contexts
- * @returns Array of prefixed token strings (e.g., "@workflow", "/web")
- */
-export function extractContextTokens(contexts: ChatContext[]): string[] {
-  return contexts
-    .filter((c) => c.kind !== 'current_workflow' && c.label)
-    .map((c) => {
-      const prefix = c.kind === 'slash_command' ? '/' : '@'
-      return `${prefix}${c.label}`
-    })
-}
-
-/**
- * Mention range for text highlighting
- */
-export interface MentionHighlightRange {
-  start: number
-  end: number
-  token: string
-}
-
-/**
- * Computes mention ranges in text for highlighting
- * @param text - Text to search
- * @param tokens - Prefixed tokens to find (e.g., "@workflow", "/web")
- * @returns Array of ranges with start, end, and matched token
- */
-export function computeMentionHighlightRanges(
-  text: string,
-  tokens: string[]
-): MentionHighlightRange[] {
-  if (!tokens.length || !text) return []
-
-  const pattern = new RegExp(`(${tokens.map(escapeRegex).join('|')})`, 'g')
-  const ranges: MentionHighlightRange[] = []
-  let match: RegExpExecArray | null
-
-  while ((match = pattern.exec(text)) !== null) {
-    ranges.push({
-      start: match.index,
-      end: match.index + match[0].length,
-      token: match[0],
-    })
-  }
-
-  return ranges
-}
-
-/**
- * Builds React nodes with highlighted mention tokens
- * @param text - Text to render
- * @param contexts - Chat contexts to highlight
- * @param createHighlightSpan - Function to create highlighted span element
- * @returns Array of React nodes with highlighted mentions
- */
-export function buildMentionHighlightNodes(
-  text: string,
-  contexts: ChatContext[],
-  createHighlightSpan: (token: string, key: string) => ReactNode
-): ReactNode[] {
-  const tokens = extractContextTokens(contexts)
-  if (!tokens.length) return [text]
-
-  const ranges = computeMentionHighlightRanges(text, tokens)
-  if (!ranges.length) return [text]
-
-  const nodes: ReactNode[] = []
-  let lastIndex = 0
-
-  for (const range of ranges) {
-    if (range.start > lastIndex) {
-      nodes.push(text.slice(lastIndex, range.start))
-    }
-    nodes.push(createHighlightSpan(range.token, `mention-${range.start}-${range.end}`))
-    lastIndex = range.end
-  }
-
-  if (lastIndex < text.length) {
-    nodes.push(text.slice(lastIndex))
-  }
-
-  return nodes
-}
-
 /**
 * Gets the data array for a folder ID from mentionData.
 * Uses FOLDER_CONFIGS as the source of truth for key mapping.
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/welcome/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/welcome/index.ts
@@ -1 +0,0 @@
-export * from './welcome'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/welcome/welcome.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/welcome/welcome.tsx
@@ -2,7 +2,9 @@

 import { Button } from '@/components/emcn'

-/** Props for the Welcome component */
+/**
+ * Props for the CopilotWelcome component
+ */
 interface WelcomeProps {
  /** Callback when a suggested question is clicked */
  onQuestionClick?: (question: string) => void
@@ -10,7 +12,13 @@ interface WelcomeProps {
  mode?: 'ask' | 'build' | 'plan'
 }

-/** Welcome screen displaying suggested questions based on current mode */
+/**
+ * Welcome screen component for the copilot
+ * Displays suggested questions and capabilities based on current mode
+ *
+ * @param props - Component props
+ * @returns Welcome screen UI
+ */
 export function Welcome({ onQuestionClick, mode = 'ask' }: WelcomeProps) {
  const capabilities =
    mode === 'build'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/copilot.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/copilot.tsx
@@ -24,7 +24,6 @@ import {
 import { Trash } from '@/components/emcn/icons/trash'
 import { cn } from '@/lib/core/utils/cn'
 import {
-  ChatHistorySkeleton,
  CopilotMessage,
  PlanModeSection,
  QueuedMessages,
@@ -41,7 +40,6 @@ import {
  useTodoManagement,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks'
 import { useScrollManagement } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import type { ChatContext } from '@/stores/panel'
 import { useCopilotStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'

@@ -76,12 +74,10 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
  const copilotContainerRef = useRef<HTMLDivElement>(null)
  const cancelEditCallbackRef = useRef<(() => void) | null>(null)
  const [editingMessageId, setEditingMessageId] = useState<string | null>(null)
+  const [isEditingMessage, setIsEditingMessage] = useState(false)
  const [revertingMessageId, setRevertingMessageId] = useState<string | null>(null)
  const [isHistoryDropdownOpen, setIsHistoryDropdownOpen] = useState(false)

-  // Derived state - editing when there's an editingMessageId
-  const isEditingMessage = editingMessageId !== null
-
  const { activeWorkflowId } = useWorkflowRegistry()

  const {
@@ -110,9 +106,9 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    areChatsFresh,
    workflowId: copilotWorkflowId,
    setPlanTodos,
-    closePlanTodos,
    clearPlanArtifact,
    savePlanArtifact,
+    setSelectedModel,
    loadAutoAllowedTools,
  } = useCopilotStore()

@@ -130,7 +126,7 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref

  // Handle scroll management (80px stickiness for copilot)
  const { scrollAreaRef, scrollToBottom } = useScrollManagement(messages, isSendingMessage, {
-    stickinessThreshold: 40,
+    stickinessThreshold: 80,
  })

  // Handle chat history grouping
@@ -150,10 +146,15 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    isSendingMessage,
    showPlanTodos,
    planTodos,
+    setPlanTodos,
  })

-  /** Gets markdown content for design document section (available in all modes once created) */
+  /**
+   * Get markdown content for design document section
+   * Available in all modes once created
+   */
  const designDocumentContent = useMemo(() => {
+    // Use streaming content if available
    if (streamingPlanContent) {
      logger.info('[DesignDocument] Using streaming plan content', {
        contentLength: streamingPlanContent.length,
@@ -164,7 +165,9 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    return ''
  }, [streamingPlanContent])

-  /** Focuses the copilot input */
+  /**
+   * Helper function to focus the copilot input
+   */
  const focusInput = useCallback(() => {
    userInputRef.current?.focus()
  }, [])
@@ -178,14 +181,20 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    currentInputValue: inputValue,
  })

-  /** Auto-scrolls to bottom when chat loads */
+  /**
+   * Auto-scroll to bottom when chat loads in
+   */
  useEffect(() => {
    if (isInitialized && messages.length > 0) {
      scrollToBottom()
    }
  }, [isInitialized, messages.length, scrollToBottom])

-  /** Cleanup on unmount - aborts active streaming. Uses refs to avoid stale closures */
+  /**
+   * Cleanup on component unmount (page refresh, navigation, etc.)
+   * Uses a ref to track sending state to avoid stale closure issues
+   * Note: Parent workflow.tsx also has useStreamCleanup for page-level cleanup
+   */
  const isSendingRef = useRef(isSendingMessage)
  isSendingRef.current = isSendingMessage
  const abortMessageRef = useRef(abortMessage)
@@ -193,15 +202,19 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref

  useEffect(() => {
    return () => {
+      // Use refs to check current values, not stale closure values
      if (isSendingRef.current) {
        abortMessageRef.current()
        logger.info('Aborted active message streaming due to component unmount')
      }
    }
+    // Empty deps - only run cleanup on actual unmount, not on re-renders
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [])

-  /** Cancels edit mode when clicking outside the current edit area */
+  /**
+   * Container-level click capture to cancel edit mode when clicking outside the current edit area
+   */
  const handleCopilotClickCapture = useCallback(
    (event: ReactMouseEvent<HTMLDivElement>) => {
      if (!isEditingMessage) return
@@ -230,7 +243,10 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    [isEditingMessage, editingMessageId]
  )

-  /** Creates a new chat session and focuses the input */
+  /**
+   * Handles creating a new chat session
+   * Focuses the input after creation
+   */
  const handleStartNewChat = useCallback(() => {
    createNewChat()
    logger.info('Started new chat')
@@ -240,7 +256,10 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    }, 100)
  }, [createNewChat])

-  /** Sets the input value and focuses the textarea */
+  /**
+   * Sets the input value and focuses the textarea
+   * @param value - The value to set in the input
+   */
  const handleSetInputValueAndFocus = useCallback(
    (value: string) => {
      setInputValue(value)
@@ -251,7 +270,7 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    [setInputValue]
  )

-  /** Exposes imperative functions to parent */
+  // Expose functions to parent
  useImperativeHandle(
    ref,
    () => ({
@@ -262,7 +281,10 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    [handleStartNewChat, handleSetInputValueAndFocus, focusInput]
  )

-  /** Aborts current message streaming and collapses todos if shown */
+  /**
+   * Handles aborting the current message streaming
+   * Collapses todos if they are currently shown
+   */
  const handleAbort = useCallback(() => {
    abortMessage()
    if (showPlanTodos) {
@@ -270,20 +292,20 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    }
  }, [abortMessage, showPlanTodos])

-  /** Closes the plan todos section and clears the todos */
-  const handleClosePlanTodos = useCallback(() => {
-    closePlanTodos()
-    setPlanTodos([])
-  }, [closePlanTodos, setPlanTodos])
-
-  /** Handles message submission to the copilot */
+  /**
+   * Handles message submission to the copilot
+   * @param query - The message text to send
+   * @param fileAttachments - Optional file attachments
+   * @param contexts - Optional context references
+   */
  const handleSubmit = useCallback(
-    async (query: string, fileAttachments?: MessageFileAttachment[], contexts?: ChatContext[]) => {
+    async (query: string, fileAttachments?: MessageFileAttachment[], contexts?: any[]) => {
      // Allow submission even when isSendingMessage - store will queue the message
      if (!query || !activeWorkflowId) return

      if (showPlanTodos) {
-        setPlanTodos([])
+        const store = useCopilotStore.getState()
+        store.setPlanTodos([])
      }

      try {
@@ -297,25 +319,37 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
        logger.error('Failed to send message:', error)
      }
    },
-    [activeWorkflowId, sendMessage, showPlanTodos, setPlanTodos]
+    [activeWorkflowId, sendMessage, showPlanTodos]
  )

-  /** Handles message edit mode changes */
+  /**
+   * Handles message edit mode changes
+   * @param messageId - ID of the message being edited
+   * @param isEditing - Whether edit mode is active
+   */
  const handleEditModeChange = useCallback(
    (messageId: string, isEditing: boolean, cancelCallback?: () => void) => {
      setEditingMessageId(isEditing ? messageId : null)
+      setIsEditingMessage(isEditing)
      cancelEditCallbackRef.current = isEditing ? cancelCallback || null : null
      logger.info('Edit mode changed', { messageId, isEditing, willDimMessages: isEditing })
    },
    []
  )

-  /** Handles checkpoint revert mode changes */
+  /**
+   * Handles checkpoint revert mode changes
+   * @param messageId - ID of the message being reverted
+   * @param isReverting - Whether revert mode is active
+   */
  const handleRevertModeChange = useCallback((messageId: string, isReverting: boolean) => {
    setRevertingMessageId(isReverting ? messageId : null)
  }, [])

-  /** Handles chat deletion */
+  /**
+   * Handles chat deletion
+   * @param chatId - ID of the chat to delete
+   */
  const handleDeleteChat = useCallback(
    async (chatId: string) => {
      try {
@@ -327,15 +361,38 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
    [deleteChat]
  )

-  /** Handles history dropdown opening state, loads chats if needed (non-blocking) */
+  /**
+   * Handles history dropdown opening state
+   * Loads chats if needed when dropdown opens (non-blocking)
+   * @param open - Whether the dropdown is open
+   */
  const handleHistoryDropdownOpen = useCallback(
    (open: boolean) => {
      setIsHistoryDropdownOpen(open)
+      // Fire hook without awaiting - prevents blocking and state issues
      handleHistoryDropdownOpenHook(open)
    },
    [handleHistoryDropdownOpenHook]
  )

+  /**
+   * Skeleton loading component for chat history
+   */
+  const ChatHistorySkeleton = () => (
+    <>
+      <PopoverSection>
+        <div className='h-3 w-12 animate-pulse rounded bg-muted/40' />
+      </PopoverSection>
+      <div className='flex flex-col gap-0.5'>
+        {[1, 2, 3].map((i) => (
+          <div key={i} className='flex h-[25px] items-center px-[6px]'>
+            <div className='h-3 w-full animate-pulse rounded bg-muted/40' />
+          </div>
+        ))}
+      </div>
+    </>
+  )
+
  return (
    <>
      <div
@@ -474,18 +531,21 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
                    className='h-full overflow-y-auto overflow-x-hidden px-[8px]'
                  >
                    <div
-                      className={`w-full max-w-full space-y-[8px] overflow-hidden py-[8px] ${
+                      className={`w-full max-w-full space-y-4 overflow-hidden py-[8px] ${
                        showPlanTodos && planTodos.length > 0 ? 'pb-14' : 'pb-10'
                      }`}
                    >
                      {messages.map((message, index) => {
+                        // Determine if this message should be dimmed
                        let isDimmed = false

+                        // Dim messages after the one being edited
                        if (editingMessageId) {
                          const editingIndex = messages.findIndex((m) => m.id === editingMessageId)
                          isDimmed = editingIndex !== -1 && index > editingIndex
                        }

+                        // Also dim messages after the one showing restore confirmation
                        if (!isDimmed && revertingMessageId) {
                          const revertingIndex = messages.findIndex(
                            (m) => m.id === revertingMessageId
@@ -493,6 +553,7 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
                          isDimmed = revertingIndex !== -1 && index > revertingIndex
                        }

+                        // Get checkpoint count for this message to force re-render when it changes
                        const checkpointCount = messageCheckpoints[message.id]?.length || 0

                        return (
@@ -527,7 +588,11 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
                      <TodoList
                        todos={planTodos}
                        collapsed={todosCollapsed}
-                        onClose={handleClosePlanTodos}
+                        onClose={() => {
+                          const store = useCopilotStore.getState()
+                          store.closePlanTodos?.()
+                          useCopilotStore.setState({ planTodos: [] })
+                        }}
                      />
                    </div>
                  )}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-chat-history.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-chat-history.ts
@@ -24,7 +24,9 @@ export function useChatHistory(props: UseChatHistoryProps) {
  const { chats, activeWorkflowId, copilotWorkflowId, loadChats, areChatsFresh, isSendingMessage } =
    props

-  /** Groups chats by time period (Today, Yesterday, This Week, etc.) */
+  /**
+   * Groups chats by time period (Today, Yesterday, This Week, etc.)
+   */
  const groupedChats = useMemo(() => {
    if (!activeWorkflowId || copilotWorkflowId !== activeWorkflowId || chats.length === 0) {
      return []
@@ -66,21 +68,18 @@ export function useChatHistory(props: UseChatHistoryProps) {
      }
    })

-    for (const groupName of Object.keys(groups)) {
-      groups[groupName].sort((a, b) => {
-        const dateA = new Date(a.updatedAt).getTime()
-        const dateB = new Date(b.updatedAt).getTime()
-        return dateB - dateA
-      })
-    }
-
    return Object.entries(groups).filter(([, chats]) => chats.length > 0)
  }, [chats, activeWorkflowId, copilotWorkflowId])

-  /** Handles history dropdown opening and loads chats if needed (non-blocking) */
+  /**
+   * Handles history dropdown opening and loads chats if needed
+   * Does not await loading - fires in background to avoid blocking UI
+   */
  const handleHistoryDropdownOpen = useCallback(
    (open: boolean) => {
+      // Only load if opening dropdown AND we don't have fresh chats AND not streaming
      if (open && activeWorkflowId && !isSendingMessage && !areChatsFresh(activeWorkflowId)) {
+        // Fire in background, don't await - same pattern as old panel
        loadChats(false).catch((error) => {
          logger.error('Failed to load chat history:', error)
        })
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-copilot-initialization.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-copilot-initialization.ts
@@ -38,7 +38,11 @@ export function useCopilotInitialization(props: UseCopilotInitializationProps) {
  const lastWorkflowIdRef = useRef<string | null>(null)
  const hasMountedRef = useRef(false)

-  /** Initialize on mount - loads chats if needed. Never loads during streaming */
+  /**
+   * Initialize on mount - only load chats if needed, don't force refresh
+   * This prevents unnecessary reloads when the component remounts (e.g., hot reload)
+   * Never loads during message streaming to prevent interrupting active conversations
+   */
  useEffect(() => {
    if (activeWorkflowId && !hasMountedRef.current && !isSendingMessage) {
      hasMountedRef.current = true
@@ -46,12 +50,19 @@ export function useCopilotInitialization(props: UseCopilotInitializationProps) {
      lastWorkflowIdRef.current = null

      setCopilotWorkflowId(activeWorkflowId)
+      // Use false to let the store decide if a reload is needed based on cache
      loadChats(false)
    }
  }, [activeWorkflowId, setCopilotWorkflowId, loadChats, isSendingMessage])

-  /** Handles genuine workflow changes, preventing re-init on every render */
+  /**
+   * Initialize the component - only on mount and genuine workflow changes
+   * Prevents re-initialization on every render or tab switch
+   * Never reloads during message streaming to preserve active conversations
+   */
  useEffect(() => {
+    // Handle genuine workflow changes (not initial mount, not same workflow)
+    // Only reload if not currently streaming to avoid interrupting conversations
    if (
      activeWorkflowId &&
      activeWorkflowId !== lastWorkflowIdRef.current &&
@@ -69,23 +80,7 @@ export function useCopilotInitialization(props: UseCopilotInitializationProps) {
      loadChats(false)
    }

-    if (
-      activeWorkflowId &&
-      !isLoadingChats &&
-      chatsLoadedForWorkflow !== null &&
-      chatsLoadedForWorkflow !== activeWorkflowId &&
-      !isSendingMessage
-    ) {
-      logger.info('Chats loaded for wrong workflow, reloading', {
-        loaded: chatsLoadedForWorkflow,
-        active: activeWorkflowId,
-      })
-      setIsInitialized(false)
-      lastWorkflowIdRef.current = activeWorkflowId
-      setCopilotWorkflowId(activeWorkflowId)
-      loadChats(false)
-    }
-
+    // Mark as initialized when chats are loaded for the active workflow
    if (
      activeWorkflowId &&
      !isLoadingChats &&
@@ -105,7 +100,9 @@ export function useCopilotInitialization(props: UseCopilotInitializationProps) {
    isSendingMessage,
  ])

-  /** Load auto-allowed tools once on mount */
+  /**
+   * Load auto-allowed tools once on mount
+   */
  const hasLoadedAutoAllowedToolsRef = useRef(false)
  useEffect(() => {
    if (hasMountedRef.current && !hasLoadedAutoAllowedToolsRef.current) {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-todo-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-todo-management.ts
@@ -6,6 +6,7 @@ interface UseTodoManagementProps {
  isSendingMessage: boolean
  showPlanTodos: boolean
  planTodos: Array<{ id: string; content: string; completed?: boolean }>
+  setPlanTodos: (todos: any[]) => void
 }

 /**
@@ -15,12 +16,14 @@ interface UseTodoManagementProps {
 * @returns Todo management utilities
 */
 export function useTodoManagement(props: UseTodoManagementProps) {
-  const { isSendingMessage, showPlanTodos, planTodos } = props
+  const { isSendingMessage, showPlanTodos, planTodos, setPlanTodos } = props

  const [todosCollapsed, setTodosCollapsed] = useState(false)
  const wasSendingRef = useRef(false)

-  /** Auto-collapse todos when stream completes */
+  /**
+   * Auto-collapse todos when stream completes. Do not prune items.
+   */
  useEffect(() => {
    if (wasSendingRef.current && !isSendingMessage && showPlanTodos) {
      setTodosCollapsed(true)
@@ -28,7 +31,9 @@ export function useTodoManagement(props: UseTodoManagementProps) {
    wasSendingRef.current = isSendingMessage
  }, [isSendingMessage, showPlanTodos])

-  /** Reset collapsed state when todos first appear */
+  /**
+   * Reset collapsed state when todos first appear
+   */
  useEffect(() => {
    if (showPlanTodos && planTodos.length > 0) {
      if (isSendingMessage) {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
@@ -214,40 +214,18 @@ const getOutputTypeForPath = (
  outputPath: string,
  mergedSubBlocksOverride?: Record<string, any>
 ): string => {
-  if (block?.triggerMode && blockConfig?.triggers?.enabled) {
-    return getBlockOutputType(block.type, outputPath, mergedSubBlocksOverride, true)
-  }
-  if (block?.type === 'starter') {
-    const startWorkflowValue =
-      mergedSubBlocksOverride?.startWorkflow?.value ?? getSubBlockValue(blockId, 'startWorkflow')
+  const subBlocks =
+    mergedSubBlocksOverride ?? useWorkflowStore.getState().blocks[blockId]?.subBlocks
+  const triggerMode = block?.triggerMode && blockConfig?.triggers?.enabled

-    if (startWorkflowValue === 'chat') {
-      const chatModeTypes: Record<string, string> = {
-        input: 'string',
-        conversationId: 'string',
-        files: 'files',
-      }
-      return chatModeTypes[outputPath] || 'any'
-    }
-    const inputFormatValue =
-      mergedSubBlocksOverride?.inputFormat?.value ?? getSubBlockValue(blockId, 'inputFormat')
-    if (inputFormatValue && Array.isArray(inputFormatValue)) {
-      const field = inputFormatValue.find(
-        (f: { name?: string; type?: string }) => f.name === outputPath
-      )
-      if (field?.type) return field.type
-    }
-  } else if (blockConfig?.category === 'triggers') {
-    const blockState = useWorkflowStore.getState().blocks[blockId]
-    const subBlocks = mergedSubBlocksOverride ?? (blockState?.subBlocks || {})
-    return getBlockOutputType(block.type, outputPath, subBlocks)
-  } else {
+  if (blockConfig?.tools?.config?.tool) {
    const operationValue = getSubBlockValue(blockId, 'operation')
-    if (blockConfig && operationValue) {
+    if (operationValue) {
      return getToolOutputType(blockConfig, operationValue, outputPath)
    }
  }
-  return 'any'
+
+  return getBlockOutputType(block?.type ?? '', outputPath, subBlocks, triggerMode)
 }

 /**
@@ -1789,7 +1767,7 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
          mergedSubBlocks
        )

-        if (fieldType === 'files' || fieldType === 'array') {
+        if (fieldType === 'files' || fieldType === 'file[]' || fieldType === 'array') {
          const blockName = parts[0]
          const remainingPath = parts.slice(2).join('.')
          processedTag = `${blockName}.${arrayFieldName}[0].${remainingPath}`
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
@@ -259,7 +259,7 @@ const OutputCodeContent = React.memo(function OutputCodeContent({
      code={code}
      showGutter
      language={language}
-      className='m-0 min-h-full rounded-none border-0 bg-[var(--surface-1)] dark:bg-[var(--surface-1)]'
+      className='m-0 min-h-full rounded-none border-0 bg-[var(--surface-1)]'
      paddingLeft={8}
      gutterStyle={{ backgroundColor: 'transparent' }}
      wrapText={wrapText}
@@ -624,7 +624,7 @@ const OutputPanel = React.memo(function OutputPanel({
                </Tooltip.Content>
              </Tooltip.Root>
            )}
-            <Popover open={outputOptionsOpen} onOpenChange={setOutputOptionsOpen} size='sm'>
+            <Popover open={outputOptionsOpen} onOpenChange={setOutputOptionsOpen}>
              <PopoverTrigger asChild>
                <Button
                  variant='ghost'
@@ -648,7 +648,7 @@ const OutputPanel = React.memo(function OutputPanel({
              >
                <PopoverItem
                  active={wrapText}
-                  showCheck={wrapText}
+                  showCheck
                  onClick={(e) => {
                    e.stopPropagation()
                    setWrapText(!wrapText)
@@ -658,7 +658,7 @@ const OutputPanel = React.memo(function OutputPanel({
                </PopoverItem>
                <PopoverItem
                  active={openOnRun}
-                  showCheck={openOnRun}
+                  showCheck
                  onClick={(e) => {
                    e.stopPropagation()
                    setOpenOnRun(!openOnRun)
@@ -1472,7 +1472,7 @@ export const Terminal = memo(function Terminal() {
            >
              {uniqueBlocks.length > 0 ? (
                <div className={clsx(COLUMN_WIDTHS.BLOCK, COLUMN_BASE_CLASS, 'flex items-center')}>
-                  <Popover open={blockFilterOpen} onOpenChange={setBlockFilterOpen} size='sm'>
+                  <Popover open={blockFilterOpen} onOpenChange={setBlockFilterOpen}>
                    <PopoverTrigger asChild>
                      <Button
                        variant='ghost'
@@ -1508,12 +1508,12 @@ export const Terminal = memo(function Terminal() {
                            <PopoverItem
                              key={block.blockId}
                              active={isSelected}
-                              showCheck={isSelected}
                              onClick={() => toggleBlock(block.blockId)}
                              className={index > 0 ? 'mt-[2px]' : ''}
                            >
                              {BlockIcon && <BlockIcon className='h-3 w-3' />}
                              <span className='flex-1'>{block.blockName}</span>
+                              {isSelected && <Check className='h-3 w-3' />}
                            </PopoverItem>
                          )
                        })}
@@ -1526,7 +1526,7 @@ export const Terminal = memo(function Terminal() {
              )}
              {hasStatusEntries ? (
                <div className={clsx(COLUMN_WIDTHS.STATUS, COLUMN_BASE_CLASS, 'flex items-center')}>
-                  <Popover open={statusFilterOpen} onOpenChange={setStatusFilterOpen} size='sm'>
+                  <Popover open={statusFilterOpen} onOpenChange={setStatusFilterOpen}>
                    <PopoverTrigger asChild>
                      <Button
                        variant='ghost'
@@ -1555,7 +1555,6 @@ export const Terminal = memo(function Terminal() {
                      <PopoverScrollArea style={{ maxHeight: '140px' }}>
                        <PopoverItem
                          active={filters.statuses.has('error')}
-                          showCheck={filters.statuses.has('error')}
                          onClick={() => toggleStatus('error')}
                        >
                          <div
@@ -1563,10 +1562,10 @@ export const Terminal = memo(function Terminal() {
                            style={{ backgroundColor: 'var(--text-error)' }}
                          />
                          <span className='flex-1'>Error</span>
+                          {filters.statuses.has('error') && <Check className='h-3 w-3' />}
                        </PopoverItem>
                        <PopoverItem
                          active={filters.statuses.has('info')}
-                          showCheck={filters.statuses.has('info')}
                          onClick={() => toggleStatus('info')}
                          className='mt-[2px]'
                        >
@@ -1575,6 +1574,7 @@ export const Terminal = memo(function Terminal() {
                            style={{ backgroundColor: 'var(--terminal-status-info-color)' }}
                          />
                          <span className='flex-1'>Info</span>
+                          {filters.statuses.has('info') && <Check className='h-3 w-3' />}
                        </PopoverItem>
                      </PopoverScrollArea>
                    </PopoverContent>
@@ -1585,7 +1585,7 @@ export const Terminal = memo(function Terminal() {
              )}
              {uniqueRunIds.length > 0 ? (
                <div className={clsx(COLUMN_WIDTHS.RUN_ID, COLUMN_BASE_CLASS, 'flex items-center')}>
-                  <Popover open={runIdFilterOpen} onOpenChange={setRunIdFilterOpen} size='sm'>
+                  <Popover open={runIdFilterOpen} onOpenChange={setRunIdFilterOpen}>
                    <PopoverTrigger asChild>
                      <Button
                        variant='ghost'
@@ -1620,16 +1620,16 @@ export const Terminal = memo(function Terminal() {
                            <PopoverItem
                              key={runId}
                              active={isSelected}
-                              showCheck={isSelected}
                              onClick={() => toggleRunId(runId)}
                              className={index > 0 ? 'mt-[2px]' : ''}
                            >
                              <span
-                                className='flex-1 font-mono text-[11px]'
+                                className='flex-1 font-mono text-[12px]'
                                style={{ color: runIdColor || '#D2D2D2' }}
                              >
                                {formatRunId(runId)}
                              </span>
+                              {isSelected && <Check className='h-3 w-3' />}
                            </PopoverItem>
                          )
                        })}
@@ -1765,7 +1765,7 @@ export const Terminal = memo(function Terminal() {
                      </Tooltip.Root>
                    </>
                  )}
-                  <Popover open={mainOptionsOpen} onOpenChange={setMainOptionsOpen} size='sm'>
+                  <Popover open={mainOptionsOpen} onOpenChange={setMainOptionsOpen}>
                    <PopoverTrigger asChild>
                      <Button
                        variant='ghost'
@@ -1789,7 +1789,7 @@ export const Terminal = memo(function Terminal() {
                    >
                      <PopoverItem
                        active={openOnRun}
-                        showCheck={openOnRun}
+                        showCheck
                        onClick={(e) => {
                          e.stopPropagation()
                          setOpenOnRun(!openOnRun)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -31,11 +31,9 @@ import {
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useBlockVisual } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
 import { useBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions'
-import { getBlock } from '@/blocks'
 import { SELECTOR_TYPES_HYDRATION_REQUIRED, type SubBlockConfig } from '@/blocks/types'
 import { getDependsOnFields } from '@/blocks/utils'
 import { useKnowledgeBase } from '@/hooks/kb/use-knowledge'
-import { useCustomTools } from '@/hooks/queries/custom-tools'
 import { useMcpServers, useMcpToolsQuery } from '@/hooks/queries/mcp'
 import { useCredentialName } from '@/hooks/queries/oauth-credentials'
 import { useReactivateSchedule, useScheduleInfo } from '@/hooks/queries/schedules'
@@ -563,59 +561,6 @@ const SubBlockRow = memo(function SubBlockRow({
    return `${names[0]}, ${names[1]} +${names.length - 2}`
  }, [subBlock?.type, rawValue, workflowVariables])

-  /**
-   * Hydrates tool references to display names.
-   * Follows the same pattern as other selectors (Slack channels, MCP tools, etc.)
-   */
-  const { data: customTools = [] } = useCustomTools(workspaceId || '')
-
-  const toolsDisplayValue = useMemo(() => {
-    if (subBlock?.type !== 'tool-input' || !Array.isArray(rawValue) || rawValue.length === 0) {
-      return null
-    }
-
-    const toolNames = rawValue
-      .map((tool: any) => {
-        if (!tool || typeof tool !== 'object') return null
-
-        // Priority 1: Use tool.title if already populated
-        if (tool.title && typeof tool.title === 'string') return tool.title
-
-        // Priority 2: Resolve custom tools with reference ID from database
-        if (tool.type === 'custom-tool' && tool.customToolId) {
-          const customTool = customTools.find((t) => t.id === tool.customToolId)
-          if (customTool?.title) return customTool.title
-          if (customTool?.schema?.function?.name) return customTool.schema.function.name
-        }
-
-        // Priority 3: Extract from inline schema (legacy format)
-        if (tool.schema?.function?.name) return tool.schema.function.name
-
-        // Priority 4: Extract from OpenAI function format
-        if (tool.function?.name) return tool.function.name
-
-        // Priority 5: Resolve built-in tool blocks from registry
-        if (
-          typeof tool.type === 'string' &&
-          tool.type !== 'custom-tool' &&
-          tool.type !== 'mcp' &&
-          tool.type !== 'workflow' &&
-          tool.type !== 'workflow_input'
-        ) {
-          const blockConfig = getBlock(tool.type)
-          if (blockConfig?.name) return blockConfig.name
-        }
-
-        return null
-      })
-      .filter((name): name is string => !!name)
-
-    if (toolNames.length === 0) return null
-    if (toolNames.length === 1) return toolNames[0]
-    if (toolNames.length === 2) return `${toolNames[0]}, ${toolNames[1]}`
-    return `${toolNames[0]}, ${toolNames[1]} +${toolNames.length - 2}`
-  }, [subBlock?.type, rawValue, customTools, workspaceId])
-
  const isPasswordField = subBlock?.password === true
  const maskedValue = isPasswordField && value && value !== '-' ? '•••' : null

@@ -624,7 +569,6 @@ const SubBlockRow = memo(function SubBlockRow({
    credentialName ||
    dropdownLabel ||
    variablesDisplayValue ||
-    toolsDisplayValue ||
    knowledgeBaseDisplayName ||
    workflowSelectionName ||
    mcpServerDisplayName ||
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts
@@ -3,20 +3,19 @@
 import { useCallback, useEffect, useRef, useState } from 'react'

 /**
- * Options for configuring scroll behavior
+ * Options for configuring scroll behavior.
 */
 interface UseScrollManagementOptions {
  /**
-   * Scroll behavior for programmatic scrolls
-   * @remarks
-   * - `smooth`: Animated scroll (default, used by Copilot)
-   * - `auto`: Immediate scroll to bottom (used by floating chat to avoid jitter)
+   * Scroll behavior for programmatic scrolls.
+   * - `smooth`: animated scroll (default, used by Copilot).
+   * - `auto`: immediate scroll to bottom (used by floating chat to avoid jitter).
   */
  behavior?: 'auto' | 'smooth'
  /**
-   * Distance from bottom (in pixels) within which auto-scroll stays active
-   * @remarks Lower values = less sticky (user can scroll away easier)
-   * @defaultValue 100
+   * Distance from bottom (in pixels) within which auto-scroll stays active.
+   * Lower values = less sticky (user can scroll away easier).
+   * Default is 100px.
   */
  stickinessThreshold?: number
 }
@@ -36,105 +35,166 @@ export function useScrollManagement(
  options?: UseScrollManagementOptions
 ) {
  const scrollAreaRef = useRef<HTMLDivElement>(null)
-  const [userHasScrolledAway, setUserHasScrolledAway] = useState(false)
-  const programmaticScrollRef = useRef(false)
+  const [isNearBottom, setIsNearBottom] = useState(true)
+  const [userHasScrolledDuringStream, setUserHasScrolledDuringStream] = useState(false)
+  const programmaticScrollInProgressRef = useRef(false)
  const lastScrollTopRef = useRef(0)
-
-  const scrollBehavior = options?.behavior ?? 'smooth'
+  const scrollBehavior: 'auto' | 'smooth' = options?.behavior ?? 'smooth'
  const stickinessThreshold = options?.stickinessThreshold ?? 100

-  /** Scrolls the container to the bottom */
+  /**
+   * Scrolls the container to the bottom with smooth animation
+   */
+  const getScrollContainer = useCallback((): HTMLElement | null => {
+    // Prefer the element with the ref (our scrollable div)
+    if (scrollAreaRef.current) return scrollAreaRef.current
+    return null
+  }, [])
+
  const scrollToBottom = useCallback(() => {
-    const container = scrollAreaRef.current
-    if (!container) return
-
-    programmaticScrollRef.current = true
-    container.scrollTo({ top: container.scrollHeight, behavior: scrollBehavior })
+    const scrollContainer = getScrollContainer()
+    if (!scrollContainer) return

+    programmaticScrollInProgressRef.current = true
+    scrollContainer.scrollTo({
+      top: scrollContainer.scrollHeight,
+      behavior: scrollBehavior,
+    })
+    // Best-effort reset; not all browsers fire scrollend reliably
    window.setTimeout(() => {
-      programmaticScrollRef.current = false
+      programmaticScrollInProgressRef.current = false
    }, 200)
-  }, [scrollBehavior])
+  }, [getScrollContainer, scrollBehavior])

-  /** Handles scroll events to track user position */
+  /**
+   * Handles scroll events to track user position and show/hide scroll button
+   */
  const handleScroll = useCallback(() => {
-    const container = scrollAreaRef.current
-    if (!container || programmaticScrollRef.current) return
+    const scrollContainer = getScrollContainer()
+    if (!scrollContainer) return

-    const { scrollTop, scrollHeight, clientHeight } = container
+    if (programmaticScrollInProgressRef.current) {
+      // Ignore scrolls we initiated
+      return
+    }
+
+    const { scrollTop, scrollHeight, clientHeight } = scrollContainer
    const distanceFromBottom = scrollHeight - scrollTop - clientHeight
+
    const nearBottom = distanceFromBottom <= stickinessThreshold
-    const delta = scrollTop - lastScrollTopRef.current
+    setIsNearBottom(nearBottom)

    if (isSendingMessage) {
-      // User scrolled up during streaming - break away
-      if (delta < -2) {
-        setUserHasScrolledAway(true)
+      const delta = scrollTop - lastScrollTopRef.current
+      const movedUp = delta < -2 // small hysteresis to avoid noise
+      const movedDown = delta > 2
+
+      if (movedUp) {
+        // Any upward movement breaks away from sticky during streaming
+        setUserHasScrolledDuringStream(true)
      }
-      // User scrolled back down to bottom - re-stick
-      if (userHasScrolledAway && delta > 2 && nearBottom) {
-        setUserHasScrolledAway(false)
+
+      // If the user has broken away and scrolls back down to the bottom, re-stick
+      if (userHasScrolledDuringStream && movedDown && nearBottom) {
+        setUserHasScrolledDuringStream(false)
      }
    }

+    // Track last scrollTop for direction detection
    lastScrollTopRef.current = scrollTop
-  }, [isSendingMessage, userHasScrolledAway, stickinessThreshold])
+  }, [getScrollContainer, isSendingMessage, userHasScrolledDuringStream, stickinessThreshold])

-  /** Attaches scroll listener to container */
+  // Attach scroll listener
  useEffect(() => {
-    const container = scrollAreaRef.current
-    if (!container) return
+    const scrollContainer = getScrollContainer()
+    if (!scrollContainer) return

-    container.addEventListener('scroll', handleScroll, { passive: true })
-    lastScrollTopRef.current = container.scrollTop
+    const handleUserScroll = () => {
+      handleScroll()
+    }

-    return () => container.removeEventListener('scroll', handleScroll)
-  }, [handleScroll])
+    scrollContainer.addEventListener('scroll', handleUserScroll, { passive: true })

-  /** Handles auto-scroll when new messages are added */
+    if ('onscrollend' in scrollContainer) {
+      scrollContainer.addEventListener('scrollend', handleScroll, { passive: true })
+    }
+
+    // Initialize state
+    window.setTimeout(handleScroll, 100)
+    // Initialize last scroll position
+    lastScrollTopRef.current = scrollContainer.scrollTop
+
+    return () => {
+      scrollContainer.removeEventListener('scroll', handleUserScroll)
+      if ('onscrollend' in scrollContainer) {
+        scrollContainer.removeEventListener('scrollend', handleScroll)
+      }
+    }
+  }, [getScrollContainer, handleScroll])
+
+  // Smart auto-scroll: only scroll if user hasn't intentionally scrolled up during streaming
  useEffect(() => {
    if (messages.length === 0) return

    const lastMessage = messages[messages.length - 1]
-    const isUserMessage = lastMessage?.role === 'user'
+    const isNewUserMessage = lastMessage?.role === 'user'

-    // Always scroll for user messages, respect scroll state for assistant messages
-    if (isUserMessage) {
-      setUserHasScrolledAway(false)
-      scrollToBottom()
-    } else if (!userHasScrolledAway) {
+    const shouldAutoScroll =
+      isNewUserMessage ||
+      (isSendingMessage && !userHasScrolledDuringStream) ||
+      (!isSendingMessage && isNearBottom)
+
+    if (shouldAutoScroll) {
      scrollToBottom()
    }
-  }, [messages, userHasScrolledAway, scrollToBottom])
+  }, [messages, isNearBottom, isSendingMessage, userHasScrolledDuringStream, scrollToBottom])

-  /** Resets scroll state when streaming completes */
+  // Reset user scroll state when streaming starts or when user sends a message
  useEffect(() => {
-    if (!isSendingMessage) {
-      setUserHasScrolledAway(false)
+    const lastMessage = messages[messages.length - 1]
+    if (lastMessage?.role === 'user') {
+      setUserHasScrolledDuringStream(false)
+      programmaticScrollInProgressRef.current = false
+      const scrollContainer = getScrollContainer()
+      if (scrollContainer) {
+        lastScrollTopRef.current = scrollContainer.scrollTop
+      }
    }
+  }, [messages, getScrollContainer])
+
+  // Reset user scroll state when streaming completes
+  const prevIsSendingRef = useRef(false)
+  useEffect(() => {
+    if (prevIsSendingRef.current && !isSendingMessage) {
+      setUserHasScrolledDuringStream(false)
+    }
+    prevIsSendingRef.current = isSendingMessage
  }, [isSendingMessage])

-  /** Keeps scroll pinned during streaming - uses interval, stops when user scrolls away */
+  // While streaming and not broken away, keep pinned to bottom
  useEffect(() => {
-    // Early return stops the interval when user scrolls away (state change re-runs effect)
-    if (!isSendingMessage || userHasScrolledAway) {
-      return
-    }
+    if (!isSendingMessage || userHasScrolledDuringStream) return

    const intervalId = window.setInterval(() => {
-      const container = scrollAreaRef.current
-      if (!container) return
+      const scrollContainer = getScrollContainer()
+      if (!scrollContainer) return

-      const { scrollTop, scrollHeight, clientHeight } = container
+      const { scrollTop, scrollHeight, clientHeight } = scrollContainer
      const distanceFromBottom = scrollHeight - scrollTop - clientHeight
-
-      if (distanceFromBottom > 1) {
+      const nearBottom = distanceFromBottom <= stickinessThreshold
+      if (nearBottom) {
        scrollToBottom()
      }
    }, 100)

    return () => window.clearInterval(intervalId)
-  }, [isSendingMessage, userHasScrolledAway, scrollToBottom])
+  }, [
+    isSendingMessage,
+    userHasScrolledDuringStream,
+    getScrollContainer,
+    scrollToBottom,
+    stickinessThreshold,
+  ])

  return {
    scrollAreaRef,
--- a/apps/sim/background/schedule-execution.ts
+++ b/apps/sim/background/schedule-execution.ts
@@ -208,6 +208,8 @@ async function runWorkflowExecution({
      snapshot,
      callbacks: {},
      loggingSession,
+      includeFileBase64: true,
+      base64MaxBytes: undefined,
    })

    if (executionResult.status === 'paused') {
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -240,6 +240,8 @@ async function executeWebhookJobInternal(
          snapshot,
          callbacks: {},
          loggingSession,
+          includeFileBase64: true, // Enable base64 hydration
+          base64MaxBytes: undefined, // Use default limit
        })

        if (executionResult.status === 'paused') {
@@ -493,6 +495,7 @@ async function executeWebhookJobInternal(
      snapshot,
      callbacks: {},
      loggingSession,
+      includeFileBase64: true,
    })

    if (executionResult.status === 'paused') {
--- a/apps/sim/background/workflow-execution.ts
+++ b/apps/sim/background/workflow-execution.ts
@@ -109,6 +109,8 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
      snapshot,
      callbacks: {},
      loggingSession,
+      includeFileBase64: true,
+      base64MaxBytes: undefined,
    })

    if (result.status === 'paused') {
--- a/apps/sim/blocks/blocks/file.ts
+++ b/apps/sim/blocks/blocks/file.ts
@@ -121,5 +121,9 @@ export const FileBlock: BlockConfig<FileParserOutput> = {
      type: 'string',
      description: 'All file contents merged into a single text string',
    },
+    processedFiles: {
+      type: 'files',
+      description: 'Array of UserFile objects for downstream use (attachments, uploads, etc.)',
+    },
  },
 }
--- a/apps/sim/components/emcn/components/code/code.css
+++ b/apps/sim/components/emcn/components/code/code.css
@@ -1,19 +1,19 @@
 /**
 * Code editor syntax token theme.
- * Cursor/VS Code base colors with Sim's vibrant saturation.
- * Colors aligned to Sim brand where applicable.
+ * Light mode: Vibrant colors matching dark mode's aesthetic quality.
+ * Dark mode: VSCode Dark+ inspired colors with deep, vibrant palette.
 * Applied to elements with .code-editor-theme class.
 */

 /**
- * Light mode token colors - Cursor style with Sim vibrancy
+ * Light mode token colors (default) - vibrant palette
 */
 .code-editor-theme .token.comment,
 .code-editor-theme .token.block-comment,
 .code-editor-theme .token.prolog,
 .code-editor-theme .token.doctype,
 .code-editor-theme .token.cdata {
-  color: #16a34a !important;
+  color: #2e7d32 !important;
 }

 .code-editor-theme .token.punctuation {
@@ -30,7 +30,7 @@
 .code-editor-theme .token.boolean,
 .code-editor-theme .token.number,
 .code-editor-theme .token.constant {
-  color: #16a34a !important;
+  color: #b45309 !important;
 }

 .code-editor-theme .token.string,
@@ -49,7 +49,7 @@
 .code-editor-theme .token.atrule,
 .code-editor-theme .token.attr-value,
 .code-editor-theme .token.keyword {
-  color: #2563eb !important;
+  color: #9333ea !important;
 }

 .code-editor-theme .token.function,
@@ -76,68 +76,68 @@
 }

 /**
- * Dark mode token colors - Cursor style with Sim vibrancy
+ * Dark mode token colors
 */
 .dark .code-editor-theme .token.comment,
 .dark .code-editor-theme .token.block-comment,
 .dark .code-editor-theme .token.prolog,
 .dark .code-editor-theme .token.doctype,
 .dark .code-editor-theme .token.cdata {
-  color: #6ec97d !important;
+  color: #8bc985 !important;
 }

 .dark .code-editor-theme .token.punctuation {
-  color: #d4d4d4 !important;
+  color: #eeeeee !important;
 }

 .dark .code-editor-theme .token.property,
 .dark .code-editor-theme .token.attr-name,
 .dark .code-editor-theme .token.variable {
-  color: #4fc3f7 !important;
+  color: #5fc9cb !important;
 }

 .dark .code-editor-theme .token.tag,
 .dark .code-editor-theme .token.boolean,
 .dark .code-editor-theme .token.number,
 .dark .code-editor-theme .token.constant {
-  color: #a5d6a7 !important;
+  color: #ffc857 !important;
 }

 .dark .code-editor-theme .token.string,
 .dark .code-editor-theme .token.char,
 .dark .code-editor-theme .token.builtin,
 .dark .code-editor-theme .token.inserted {
-  color: #f39c6b !important;
+  color: #ff6b6b !important;
 }

 .dark .code-editor-theme .token.operator,
 .dark .code-editor-theme .token.entity,
 .dark .code-editor-theme .token.url {
-  color: #d4d4d4 !important;
+  color: #eeeeee !important;
 }

 .dark .code-editor-theme .token.atrule,
 .dark .code-editor-theme .token.attr-value,
 .dark .code-editor-theme .token.keyword {
-  color: #4db8ff !important;
+  color: #d896d8 !important;
 }

 .dark .code-editor-theme .token.function,
 .dark .code-editor-theme .token.class-name {
-  color: #fbbf24 !important;
+  color: #ffc857 !important;
 }

 .dark .code-editor-theme .token.regex,
 .dark .code-editor-theme .token.important {
-  color: #f87171 !important;
+  color: #ff6b6b !important;
 }

 .dark .code-editor-theme .token.symbol {
-  color: #d4d4d4 !important;
+  color: #eeeeee !important;
 }

 .dark .code-editor-theme .token.deleted {
-  color: #f87171 !important;
+  color: #ff6b6b !important;
 }

 /* Blue accents for <var> and {{ENV}} placeholders - dark mode */
--- a/apps/sim/emails/broadcasts/v0.5.html
+++ b/apps/sim/emails/broadcasts/v0.5.html
@@ -1,292 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>What's New at Sim</title>
-</head>
-<body style="margin:0;padding:0;background-color:#ffffff;">
-  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" style="background-color:#ffffff;">
-    <tr>
-      <td align="center" style="padding:0 16px;">
-        <table width="600" cellspacing="0" cellpadding="0" border="0" role="presentation" style="max-width:600px;width:100%;">
-          
-          <!-- Logo -->
-          <tr>
-            <td align="center" style="padding-top:32px;padding-bottom:16px;">
-              <a href="https://sim.ai" style="color:#000;text-decoration:none;" target="_blank">
-                <img src="https://sim.ai/email/broadcast/v0.5/logo.svg" width="79" alt="Sim Logo" style="display:block;width:79px;" border="0">
-              </a>
-            </td>
-          </tr>
-
-          <!-- Intro Text -->
-          <tr>
-            <td align="left" style="color:#404040;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;line-height:24px;word-break:break-word;padding-bottom:20px;padding-top:25px;text-align:left;">
-              <p style="margin:0;">We've been heads down building features to make Sim the best way to build, deploy, and observe AI workflows. Here's what's new: <strong>Copilot</strong> for context-aware assistance, <strong>MCP deployment</strong> to expose workflows as tools, a complete <strong>Logs & Dashboard</strong> for execution observability, and <strong>realtime collaboration</strong> so your team can build together.</p>
-            </td>
-          </tr>
-
-          <!-- CTA Button -->
-          <tr>
-            <td align="center" style="padding-bottom:15px;padding-top:15px;">
-              <table cellspacing="0" cellpadding="0" border="0" role="presentation">
-                <tr>
-                  <td align="center" style="background-color:#32bd7e;border-radius:5px;">
-                    <a href="https://sim.ai" style="display:inline-block;font-weight:500;font-size:14px;padding:6px 14px;text-decoration:none;color:#ffffff;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;" target="_blank">Try Sim</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-
-          <!-- Divider -->
-          <tr>
-            <td align="center" style="padding-bottom:10px;padding-top:10px;">
-              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" height="1" style="border-top:1px solid #ededed;">
-                <tr>
-                  <td height="0" style="font-size:0;line-height:0;">&#173;</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-
-          <!-- Section Header: What's New -->
-          <tr>
-            <td align="left" style="color:#5c5c5c;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;word-break:break-word;line-height:1;padding-bottom:11px;padding-top:9px;text-align:left;">
-              <p style="margin:0;"><em>Build smarter, ship faster</em></p>
-            </td>
-          </tr>
-
-          <tr>
-            <td align="left" valign="top" style="color:#2d2d2d;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;word-break:break-word;line-height:1;padding-bottom:15px;text-align:left;">
-              <h2 style="margin:0;color:#2d2d2d;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:32px;word-break:break-word;">What's new in Sim</h2>
-            </td>
-          </tr>
-
-          <!-- FEATURE 1: Copilot -->
-          <tr>
-            <td align="center" style="padding-top:15px;border-radius:8px;font-size:0;line-height:0;">
-              <a href="https://sim.ai" style="color:#000;text-decoration:none;" target="_blank">
-                <img src="https://sim.ai/email/broadcast/v0.5/copilot.gif" width="570" alt="Sim Copilot" style="display:block;width:100%;border-radius:8px;" border="0">
-              </a>
-            </td>
-          </tr>
-
-          <tr>
-            <td align="left" style="color:#404040;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;line-height:24px;word-break:break-word;padding-bottom:20px;padding-top:25px;text-align:left;">
-              <h4 style="margin:0;color:#2d2d2d;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:18px;word-break:break-word;"><strong>Copilot</strong></h4>
-              <br>
-              <p style="margin:0;font-size:16px;">Copilot is a context-aware assistant embedded directly into the Sim editor. It has first-class access to your workflows, blocks, execution logs, and documentation—helping you build, debug, and optimize without leaving the canvas. Ask it to explain a workflow, propose changes, or execute actions. All writes are gated behind explicit approval, so you stay in control.</p>
-            </td>
-          </tr>
-
-          <!-- FEATURE 2: MCP Deployment -->
-          <tr>
-            <td align="center" style="padding-top:15px;">
-              <a href="https://sim.ai" style="text-decoration:none;display:block;" target="_blank">
-                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" style="background-color:#181C1E;border-radius:8px;">
-                  <tr>
-                    <td align="center" style="padding:40px 30px;">
-                      <table cellspacing="0" cellpadding="0" border="0" role="presentation">
-                        <tr>
-                          <td align="center" style="padding-bottom:16px;">
-                            <img src="https://sim.ai/email/broadcast/v0.5/mcp.png" width="48" height="48" alt="MCP" style="display:block;" border="0">
-                          </td>
-                        </tr>
-                        <tr>
-                          <td align="center">
-                            <p style="margin:0;color:#ffffff;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:24px;font-weight:bold;">MCP Deployment</p>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td align="center" style="padding-top:8px;">
-                            <p style="margin:0;color:#a0a0a0;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:14px;">Expose workflows as tools for any agent</p>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </a>
-            </td>
-          </tr>
-
-          <tr>
-            <td align="left" style="color:#404040;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;line-height:24px;word-break:break-word;padding-bottom:20px;padding-top:25px;text-align:left;">
-              <h4 style="margin:0;color:#2d2d2d;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:18px;word-break:break-word;"><strong>MCP Deployment</strong></h4>
-              <br>
-              <p style="margin:0;font-size:16px;">Deploy any workflow as an MCP tool and expose it to any MCP-compatible agent—Claude Desktop, Cursor, or your own applications. Define custom tool names, descriptions, and parameter schemas. Your workflows become reusable building blocks that other agents can invoke, turning Sim into the backend for your agentic systems.</p>
-            </td>
-          </tr>
-
-          <!-- FEATURE 3: Logs & Dashboard -->
-          <tr>
-            <td align="center" style="padding-top:15px;border-radius:8px;font-size:0;line-height:0;">
-              <a href="https://sim.ai" style="color:#000;text-decoration:none;" target="_blank">
-                <img src="https://sim.ai/email/broadcast/v0.5/dashboard.jpeg" width="570" alt="Logs & Dashboard" style="display:block;width:100%;border-radius:8px;" border="0">
-              </a>
-            </td>
-          </tr>
-
-          <tr>
-            <td align="left" style="color:#404040;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;line-height:24px;word-break:break-word;padding-bottom:20px;padding-top:25px;text-align:left;">
-              <h4 style="margin:0;color:#2d2d2d;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:18px;word-break:break-word;"><strong>Logs & Dashboard</strong></h4>
-              <br>
-              <p style="margin:0;font-size:16px;">Full observability for every execution. Trace spans show you exactly what happened at each step—durations, token usage, cost breakdowns by model, and error details when things go wrong. Filter by time range, trigger type, or workflow. Live mode auto-refreshes every 5 seconds. Restore any previous workflow state with execution snapshots.</p>
-            </td>
-          </tr>
-
-          <!-- FEATURE 4: Collaboration -->
-          <tr>
-            <td align="center" style="padding-top:15px;border-radius:8px;font-size:0;line-height:0;">
-              <a href="https://sim.ai" style="color:#000;text-decoration:none;" target="_blank">
-                <img src="https://sim.ai/studio/multiplayer/cover.png" width="570" alt="Realtime Collaboration" style="display:block;width:100%;border-radius:8px;" border="0">
-              </a>
-            </td>
-          </tr>
-
-          <tr>
-            <td align="left" style="color:#404040;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;line-height:24px;word-break:break-word;padding-bottom:20px;padding-top:25px;text-align:left;">
-              <h4 style="margin:0;color:#2d2d2d;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:18px;word-break:break-word;"><strong>Realtime Collaboration</strong></h4>
-              <br>
-              <p style="margin:0;font-size:16px;">Invite teammates to your workspace and build workflows together in realtime—like Figma for AI agents. See cursors move, blocks added, and configurations updated as they happen. The operation queue ensures reliability even under poor network conditions. Undo/redo works per-user, so your changes stay separate from your collaborators'.</p>
-            </td>
-          </tr>
-
-          <!-- Divider -->
-          <tr>
-            <td align="center" style="padding-bottom:10px;padding-top:20px;">
-              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" height="1" style="border-top:1px solid #ededed;">
-                <tr>
-                  <td height="0" style="font-size:0;line-height:0;">&#173;</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-
-          <!-- Final CTA -->
-          <tr>
-            <td align="left" style="color:#404040;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;font-size:16px;line-height:24px;word-break:break-word;padding-bottom:15px;padding-top:15px;text-align:left;">
-              <p style="margin:0;">Ready to build? These features are available now in Sim.</p>
-            </td>
-          </tr>
-
-          <tr>
-            <td align="center" style="padding-bottom:30px;padding-top:15px;">
-              <table cellspacing="0" cellpadding="0" border="0" role="presentation">
-                <tr>
-                  <td align="center" style="background-color:#32bd7e;border-radius:5px;">
-                    <a href="https://sim.ai" style="display:inline-block;font-weight:500;font-size:14px;padding:6px 14px;text-decoration:none;color:#ffffff;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;" target="_blank">Get Started</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-
-        </table>
-      </td>
-    </tr>
-  </table>
-
-  <!-- Footer Section -->
-  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" style="background-color:#F7F9FC;">
-    <tr>
-      <td align="center">
-        <table width="600" cellspacing="0" cellpadding="0" border="0" role="presentation" style="max-width:600px;width:100%;">
-          <tbody>
-            <!-- Top spacer -->
-            <tr>
-              <td height="32" style="font-size:1px;line-height:1px;">&nbsp;</td>
-            </tr>
-
-            <!-- Social links row -->
-            <tr>
-              <td align="center">
-                <table cellspacing="0" cellpadding="0" border="0" role="presentation">
-                  <tbody>
-                    <tr>
-                      <td align="center" style="padding:0 8px 0 0;">
-                        <a href="https://sim.ai/x" rel="noopener noreferrer" target="_blank">
-                          <img src="https://sim.ai/static/x-icon.png" width="20" height="20" alt="X" style="display:block;" border="0">
-                        </a>
-                      </td>
-                      <td align="center" style="padding:0 8px;">
-                        <a href="https://sim.ai/discord" rel="noopener noreferrer" target="_blank">
-                          <img src="https://sim.ai/static/discord-icon.png" width="20" height="20" alt="Discord" style="display:block;" border="0">
-                        </a>
-                      </td>
-                      <td align="center" style="padding:0 8px;">
-                        <a href="https://sim.ai/github" rel="noopener noreferrer" target="_blank">
-                          <img src="https://sim.ai/static/github-icon.png" width="20" height="20" alt="GitHub" style="display:block;" border="0">
-                        </a>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </td>
-            </tr>
-
-            <!-- Spacer -->
-            <tr>
-              <td height="16" style="font-size:1px;line-height:1px;">&nbsp;</td>
-            </tr>
-
-            <!-- Address row -->
-            <tr>
-              <td align="center" style="font-size:12px;line-height:20px;color:#737373;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;margin:0;">
-                Sim, 80 Langton St, San Francisco, CA 94103, USA
-              </td>
-            </tr>
-
-            <!-- Spacer -->
-            <tr>
-              <td height="8" style="font-size:1px;line-height:1px;">&nbsp;</td>
-            </tr>
-
-            <!-- Contact row -->
-            <tr>
-              <td align="center" style="font-size:12px;line-height:20px;color:#737373;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;margin:0;">
-                Questions? <a href="mailto:support@sim.ai" style="color:#737373;text-decoration:underline;font-weight:normal;">support@sim.ai</a>
-              </td>
-            </tr>
-
-            <!-- Spacer -->
-            <tr>
-              <td height="8" style="font-size:1px;line-height:1px;">&nbsp;</td>
-            </tr>
-
-            <!-- Links row -->
-            <tr>
-              <td align="center" style="font-size:12px;line-height:20px;color:#737373;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;margin:0;">
-                <a href="https://sim.ai/privacy" style="color:#737373;text-decoration:underline;font-weight:normal;" rel="noopener noreferrer" target="_blank">Privacy Policy</a>
-                &nbsp;•&nbsp;
-                <a href="https://sim.ai/terms" style="color:#737373;text-decoration:underline;font-weight:normal;" rel="noopener noreferrer" target="_blank">Terms of Service</a>
-                &nbsp;•&nbsp;
-                <a href="{{{RESEND_UNSUBSCRIBE_URL}}}" style="color:#737373;text-decoration:underline;font-weight:normal;" rel="noopener noreferrer" target="_blank">Unsubscribe</a>
-              </td>
-            </tr>
-
-            <!-- Spacer -->
-            <tr>
-              <td height="16" style="font-size:1px;line-height:1px;">&nbsp;</td>
-            </tr>
-
-            <!-- Copyright row -->
-            <tr>
-              <td align="center" style="font-size:12px;line-height:20px;color:#737373;font-family:-apple-system,'SF Pro Display','SF Pro Text','Helvetica',sans-serif;margin:0;">
-                © 2026 Sim, All Rights Reserved
-              </td>
-            </tr>
-
-            <!-- Bottom spacer -->
-            <tr>
-              <td height="32" style="font-size:1px;line-height:1px;">&nbsp;</td>
-            </tr>
-          </tbody>
-        </table>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -3,6 +3,10 @@ import { mcpServers } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray, isNull } from 'drizzle-orm'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import {
+  containsUserFileWithMetadata,
+  hydrateUserFilesWithBase64,
+} from '@/lib/uploads/utils/user-file-base64.server'
 import {
  BlockType,
  buildResumeApiUrl,
@@ -135,6 +139,14 @@ export class BlockExecutor {
        normalizedOutput = this.normalizeOutput(output)
      }

+      if (ctx.includeFileBase64 && containsUserFileWithMetadata(normalizedOutput)) {
+        normalizedOutput = (await hydrateUserFilesWithBase64(normalizedOutput, {
+          requestId: ctx.metadata.requestId,
+          executionId: ctx.executionId,
+          maxBytes: ctx.base64MaxBytes,
+        })) as NormalizedBlockOutput
+      }
+
      const duration = Date.now() - startTime

      if (blockLog) {
--- a/apps/sim/executor/execution/executor.ts
+++ b/apps/sim/executor/execution/executor.ts
@@ -169,6 +169,8 @@ export class DAGExecutor {
      onBlockStart: this.contextExtensions.onBlockStart,
      onBlockComplete: this.contextExtensions.onBlockComplete,
      abortSignal: this.contextExtensions.abortSignal,
+      includeFileBase64: this.contextExtensions.includeFileBase64,
+      base64MaxBytes: this.contextExtensions.base64MaxBytes,
    }

    if (this.contextExtensions.resumeFromSnapshot) {
--- a/apps/sim/executor/execution/types.ts
+++ b/apps/sim/executor/execution/types.ts
@@ -89,6 +89,8 @@ export interface ContextExtensions {
   * When aborted, the execution should stop gracefully.
   */
  abortSignal?: AbortSignal
+  includeFileBase64?: boolean
+  base64MaxBytes?: number
  onStream?: (streamingExecution: unknown) => Promise<void>
  onBlockStart?: (
    blockId: string,
--- a/apps/sim/executor/handlers/agent/agent-handler.test.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.test.ts
@@ -387,7 +387,6 @@ describe('AgentBlockHandler', () => {
          code: 'return { result: "auto tool executed", input }',
          input: 'test input',
        }),
-        false, // skipProxy
        false, // skipPostProcess
        expect.any(Object) // execution context
      )
@@ -400,7 +399,6 @@ describe('AgentBlockHandler', () => {
          code: 'return { result: "force tool executed", input }',
          input: 'another test',
        }),
-        false, // skipProxy
        false, // skipPostProcess
        expect.any(Object) // execution context
      )
@@ -1407,7 +1405,7 @@ describe('AgentBlockHandler', () => {
    })

    it('should handle MCP tools in agent execution', async () => {
-      mockExecuteTool.mockImplementation((toolId, params, skipProxy, skipPostProcess, context) => {
+      mockExecuteTool.mockImplementation((toolId, params, skipPostProcess, context) => {
        if (isMcpTool(toolId)) {
          return Promise.resolve({
            success: true,
@@ -1682,7 +1680,7 @@ describe('AgentBlockHandler', () => {

    it('should provide workspaceId context for MCP tool execution', async () => {
      let capturedContext: any
-      mockExecuteTool.mockImplementation((toolId, params, skipProxy, skipPostProcess, context) => {
+      mockExecuteTool.mockImplementation((toolId, params, skipPostProcess, context) => {
        capturedContext = context
        if (isMcpTool(toolId)) {
          return Promise.resolve({
--- a/apps/sim/executor/handlers/agent/agent-handler.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.ts
@@ -325,7 +325,6 @@ export class AgentBlockHandler implements BlockHandler {
            },
          },
          false,
-          false,
          ctx
        )

--- a/apps/sim/executor/handlers/api/api-handler.test.ts
+++ b/apps/sim/executor/handlers/api/api-handler.test.ts
@@ -106,7 +106,6 @@ describe('ApiBlockHandler', () => {
        body: { key: 'value' }, // Expect parsed body
        _context: { workflowId: 'test-workflow-id' },
      },
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
@@ -158,7 +157,6 @@ describe('ApiBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'http_request',
      expect.objectContaining({ body: expectedParsedBody }),
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
@@ -175,7 +173,6 @@ describe('ApiBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'http_request',
      expect.objectContaining({ body: 'This is plain text' }),
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
@@ -192,7 +189,6 @@ describe('ApiBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'http_request',
      expect.objectContaining({ body: undefined }),
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
--- a/apps/sim/executor/handlers/api/api-handler.ts
+++ b/apps/sim/executor/handlers/api/api-handler.ts
@@ -82,7 +82,6 @@ export class ApiBlockHandler implements BlockHandler {
          },
        },
        false,
-        false,
        ctx
      )

--- a/apps/sim/executor/handlers/condition/condition-handler.test.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.test.ts
@@ -201,7 +201,6 @@ describe('ConditionBlockHandler', () => {
        },
      }),
      false,
-      false,
      mockContext
    )
  })
--- a/apps/sim/executor/handlers/condition/condition-handler.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.ts
@@ -44,7 +44,6 @@ export async function evaluateConditionExpression(
        },
      },
      false,
-      false,
      ctx
    )

--- a/apps/sim/executor/handlers/function/function-handler.test.ts
+++ b/apps/sim/executor/handlers/function/function-handler.test.ts
@@ -84,7 +84,6 @@ describe('FunctionBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'function_execute',
      expectedToolParams,
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
@@ -117,7 +116,6 @@ describe('FunctionBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'function_execute',
      expectedToolParams,
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
@@ -142,7 +140,6 @@ describe('FunctionBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'function_execute',
      expectedToolParams,
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
--- a/apps/sim/executor/handlers/function/function-handler.ts
+++ b/apps/sim/executor/handlers/function/function-handler.ts
@@ -42,7 +42,6 @@ export class FunctionBlockHandler implements BlockHandler {
        },
      },
      false,
-      false,
      ctx
    )

--- a/apps/sim/executor/handlers/generic/generic-handler.test.ts
+++ b/apps/sim/executor/handlers/generic/generic-handler.test.ts
@@ -95,7 +95,6 @@ describe('GenericBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'some_custom_tool',
      expectedToolParams,
-      false, // skipProxy
      false, // skipPostProcess
      mockContext // execution context
    )
--- a/apps/sim/executor/handlers/generic/generic-handler.ts
+++ b/apps/sim/executor/handlers/generic/generic-handler.ts
@@ -70,7 +70,6 @@ export class GenericBlockHandler implements BlockHandler {
          },
        },
        false,
-        false,
        ctx
      )

--- a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
+++ b/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
@@ -633,7 +633,7 @@ export class HumanInTheLoopBlockHandler implements BlockHandler {
          blockNameMapping: blockNameMappingWithPause,
        }

-        const result = await executeTool(toolId, toolParams, false, false, ctx)
+        const result = await executeTool(toolId, toolParams, false, ctx)
        const durationMs = Date.now() - startTime

        if (!result.success) {
--- a/apps/sim/executor/types.ts
+++ b/apps/sim/executor/types.ts
@@ -11,6 +11,7 @@ export interface UserFile {
  type: string
  key: string
  context?: string
+  base64?: string
 }

 export interface ParallelPauseScope {
@@ -236,6 +237,19 @@ export interface ExecutionContext {

  // Dynamically added nodes that need to be scheduled (e.g., from parallel expansion)
  pendingDynamicNodes?: string[]
+
+  /**
+   * When true, UserFile objects in block outputs will be hydrated with base64 content
+   * before being stored in execution state. This ensures base64 is available for
+   * variable resolution in downstream blocks.
+   */
+  includeFileBase64?: boolean
+
+  /**
+   * Maximum file size in bytes for base64 hydration. Files larger than this limit
+   * will not have their base64 content fetched.
+   */
+  base64MaxBytes?: number
 }

 export interface ExecutionResult {
--- a/apps/sim/executor/utils/start-block.ts
+++ b/apps/sim/executor/utils/start-block.ts
@@ -1,4 +1,4 @@
-import { isUserFile } from '@/lib/core/utils/display-filters'
+import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
 import {
  classifyStartBlockType,
  getLegacyStarterMode,
@@ -234,7 +234,7 @@ function getFilesFromWorkflowInput(workflowInput: unknown): UserFile[] | undefin
    return undefined
  }
  const files = workflowInput.files
-  if (Array.isArray(files) && files.every(isUserFile)) {
+  if (Array.isArray(files) && files.every(isUserFileWithMetadata)) {
    return files
  }
  return undefined
--- a/apps/sim/executor/variables/resolvers/block.ts
+++ b/apps/sim/executor/variables/resolvers/block.ts
@@ -1,3 +1,4 @@
+import { USER_FILE_ACCESSIBLE_PROPERTIES } from '@/lib/workflows/types'
 import {
  isReference,
  normalizeName,
@@ -20,11 +21,58 @@ function isPathInOutputSchema(
    return true
  }

+  const isFileArrayType = (value: any): boolean =>
+    value?.type === 'file[]' || value?.type === 'files'
+
  let current: any = outputs
  for (let i = 0; i < pathParts.length; i++) {
    const part = pathParts[i]

+    const arrayMatch = part.match(/^([^[]+)\[(\d+)\]$/)
+    if (arrayMatch) {
+      const [, prop] = arrayMatch
+      let fieldDef: any
+
+      if (prop in current) {
+        fieldDef = current[prop]
+      } else if (current.properties && prop in current.properties) {
+        fieldDef = current.properties[prop]
+      } else if (current.type === 'array' && current.items) {
+        if (current.items.properties && prop in current.items.properties) {
+          fieldDef = current.items.properties[prop]
+        } else if (prop in current.items) {
+          fieldDef = current.items[prop]
+        }
+      }
+
+      if (!fieldDef) {
+        return false
+      }
+
+      if (isFileArrayType(fieldDef)) {
+        if (i + 1 < pathParts.length) {
+          return USER_FILE_ACCESSIBLE_PROPERTIES.includes(pathParts[i + 1] as any)
+        }
+        return true
+      }
+
+      if (fieldDef.type === 'array' && fieldDef.items) {
+        current = fieldDef.items
+        continue
+      }
+
+      current = fieldDef
+      continue
+    }
+
    if (/^\d+$/.test(part)) {
+      if (isFileArrayType(current)) {
+        if (i + 1 < pathParts.length) {
+          const nextPart = pathParts[i + 1]
+          return USER_FILE_ACCESSIBLE_PROPERTIES.includes(nextPart as any)
+        }
+        return true
+      }
      continue
    }

@@ -33,7 +81,15 @@ function isPathInOutputSchema(
    }

    if (part in current) {
-      current = current[part]
+      const nextCurrent = current[part]
+      if (nextCurrent?.type === 'file[]' && i + 1 < pathParts.length) {
+        const nextPart = pathParts[i + 1]
+        if (/^\d+$/.test(nextPart) && i + 2 < pathParts.length) {
+          const propertyPart = pathParts[i + 2]
+          return USER_FILE_ACCESSIBLE_PROPERTIES.includes(propertyPart as any)
+        }
+      }
+      current = nextCurrent
      continue
    }

@@ -53,6 +109,10 @@ function isPathInOutputSchema(
      }
    }

+    if (isFileArrayType(current) && USER_FILE_ACCESSIBLE_PROPERTIES.includes(part as any)) {
+      return true
+    }
+
    if ('type' in current && typeof current.type === 'string') {
      if (!current.properties && !current.items) {
        return false
--- a/apps/sim/lib/copilot/tools/client/examples/get-examples-rag.ts
+++ b/apps/sim/lib/copilot/tools/client/examples/get-examples-rag.ts
@@ -26,20 +26,21 @@ export class GetExamplesRagClientTool extends BaseClientTool {
    getDynamicText: (params, state) => {
      if (params?.query && typeof params.query === 'string') {
        const query = params.query
+        const truncated = query.length > 40 ? `${query.slice(0, 40)}...` : query

        switch (state) {
          case ClientToolCallState.success:
-            return `Found examples for ${query}`
+            return `Found examples for ${truncated}`
          case ClientToolCallState.executing:
          case ClientToolCallState.generating:
          case ClientToolCallState.pending:
-            return `Searching examples for ${query}`
+            return `Searching examples for ${truncated}`
          case ClientToolCallState.error:
-            return `Failed to find examples for ${query}`
+            return `Failed to find examples for ${truncated}`
          case ClientToolCallState.aborted:
-            return `Aborted searching examples for ${query}`
+            return `Aborted searching examples for ${truncated}`
          case ClientToolCallState.rejected:
-            return `Skipped searching examples for ${query}`
+            return `Skipped searching examples for ${truncated}`
        }
      }
      return undefined
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vikhyath Mondreti	785e3a7601	use ipaddr	2026-01-20 17:37:57 -08:00
Vikhyath Mondreti	c85350fe80	fix tests	2026-01-20 17:28:54 -08:00
Vikhyath Mondreti	5441ad924f	remove proxy routes	2026-01-20 17:18:58 -08:00
Vikhyath Mondreti	257e049ad4	fix redirect case	2026-01-20 16:44:33 -08:00
Vikhyath Mondreti	7af5c189de	reject promise correctly	2026-01-20 16:34:19 -08:00
Vikhyath Mondreti	bcf65aa369	path security vuln	2026-01-20 16:20:22 -08:00
Vikhyath Mondreti	f1516505d4	cleanup comments	2026-01-20 15:33:56 -08:00
Vikhyath Mondreti	0b67500fb4	fix types	2026-01-20 15:26:16 -08:00
Vikhyath Mondreti	c1200efaa5	improvement(execution): update execution for passing base64 strings	2026-01-20 13:56:13 -08:00
Vikhyath Mondreti	05c4538bb6	progress	2026-01-20 08:38:27 -08:00
				`@@ -1 +0,0 @@`
				`export { default as CopilotMarkdownRenderer } from './markdown-renderer'`