v0.2

v0.1
v0
2026-01-21 21:08:09 -05:00 · 2026-01-20 14:51:40 -08:00 · 2026-01-20 10:06:18 -08:00 · 2026-01-19 19:46:56 -08:00
345 changed files with 9192 additions and 10196 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/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 </p>

 <p align="center">
-  <a href="https://deepwiki.com/simstudioai/sim" target="_blank" rel="noopener noreferrer"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>  <a href="https://cursor.com/link/prompt?text=Help%20me%20set%20up%20Sim%20locally.%20Follow%20these%20steps%3A%0A%0A1.%20First%2C%20verify%20Docker%20is%20installed%20and%20running%3A%0A%20%20%20docker%20--version%0A%20%20%20docker%20info%0A%0A2.%20Clone%20the%20repository%3A%0A%20%20%20git%20clone%20https%3A%2F%2Fgithub.com%2Fsimstudioai%2Fsim.git%0A%20%20%20cd%20sim%0A%0A3.%20Start%20the%20services%20with%20Docker%20Compose%3A%0A%20%20%20docker%20compose%20-f%20docker-compose.prod.yml%20up%20-d%0A%0A4.%20Wait%20for%20all%20containers%20to%20be%20healthy%20(this%20may%20take%201-2%20minutes)%3A%0A%20%20%20docker%20compose%20-f%20docker-compose.prod.yml%20ps%0A%0A5.%20Verify%20the%20app%20is%20accessible%20at%20http%3A%2F%2Flocalhost%3A3000%0A%0AIf%20there%20are%20any%20errors%2C%20help%20me%20troubleshoot%20them.%20Common%20issues%3A%0A-%20Port%203000%2C%203002%2C%20or%205432%20already%20in%20use%0A-%20Docker%20not%20running%0A-%20Insufficient%20memory%20(needs%2012GB%2B%20RAM)%0A%0AFor%20local%20AI%20models%20with%20Ollama%2C%20use%20this%20instead%20of%20step%203%3A%0A%20%20%20docker%20compose%20-f%20docker-compose.ollama.yml%20--profile%20setup%20up%20-d"><img src="https://img.shields.io/badge/Set%20Up%20with-Cursor-000000?logo=cursor&logoColor=white" alt="Set Up with Cursor"></a>
+  <a href="https://deepwiki.com/simstudioai/sim" target="_blank" rel="noopener noreferrer"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>  <a href="https://cursor.com/link/prompt?text=Help%20me%20set%20up%20Sim%20Studio%20locally.%20Follow%20these%20steps%3A%0A%0A1.%20First%2C%20verify%20Docker%20is%20installed%20and%20running%3A%0A%20%20%20docker%20--version%0A%20%20%20docker%20info%0A%0A2.%20Clone%20the%20repository%3A%0A%20%20%20git%20clone%20https%3A%2F%2Fgithub.com%2Fsimstudioai%2Fsim.git%0A%20%20%20cd%20sim%0A%0A3.%20Start%20the%20services%20with%20Docker%20Compose%3A%0A%20%20%20docker%20compose%20-f%20docker-compose.prod.yml%20up%20-d%0A%0A4.%20Wait%20for%20all%20containers%20to%20be%20healthy%20(this%20may%20take%201-2%20minutes)%3A%0A%20%20%20docker%20compose%20-f%20docker-compose.prod.yml%20ps%0A%0A5.%20Verify%20the%20app%20is%20accessible%20at%20http%3A%2F%2Flocalhost%3A3000%0A%0AIf%20there%20are%20any%20errors%2C%20help%20me%20troubleshoot%20them.%20Common%20issues%3A%0A-%20Port%203000%2C%203002%2C%20or%205432%20already%20in%20use%0A-%20Docker%20not%20running%0A-%20Insufficient%20memory%20(needs%2012GB%2B%20RAM)%0A%0AFor%20local%20AI%20models%20with%20Ollama%2C%20use%20this%20instead%20of%20step%203%3A%0A%20%20%20docker%20compose%20-f%20docker-compose.ollama.yml%20--profile%20setup%20up%20-d"><img src="https://img.shields.io/badge/Set%20Up%20with-Cursor-000000?logo=cursor&logoColor=white" alt="Set Up with Cursor"></a>
 </p>

 ### Build Workflows with Ease
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -4093,23 +4093,6 @@ export function SQSIcon(props: SVGProps<SVGSVGElement>) {
  )
 }

-export function TextractIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      {...props}
-      viewBox='10 14 60 52'
-      version='1.1'
-      xmlns='http://www.w3.org/2000/svg'
-      xmlnsXlink='http://www.w3.org/1999/xlink'
-    >
-      <path
-        d='M22.0624102,50 C24.3763895,53.603 28.4103535,56 33.0003125,56 C40.1672485,56 45.9991964,50.168 45.9991964,43 C45.9991964,35.832 40.1672485,30 33.0003125,30 C27.6033607,30 22.9664021,33.307 21.0024196,38 L23.2143999,38 C25.0393836,34.444 28.7363506,32 33.0003125,32 C39.0652583,32 43.9992143,36.935 43.9992143,43 C43.9992143,49.065 39.0652583,54 33.0003125,54 C29.5913429,54 26.5413702,52.441 24.5213882,50 L22.0624102,50 Z M37.0002768,45 L37.0002768,43 L41.9992321,43 C41.9992321,38.038 37.9622682,34 33.0003125,34 C28.0373568,34 23.9993929,38.038 23.9993929,43 L28.9993482,43 L28.9993482,45 L24.2313908,45 C25.1443826,49.002 28.7253507,52 33.0003125,52 C35.1362934,52 37.0992759,51.249 38.6442621,50 L34.0003036,50 L34.0003036,48 L40.4782457,48 C41.0812403,47.102 41.5202364,46.087 41.7682342,45 L37.0002768,45 Z M21.0024196,48 L23.2143999,48 C22.4434068,46.498 22.0004107,44.801 22.0004107,43 C22.0004107,41.959 22.1554093,40.955 22.4264069,40 L20.3634253,40 C20.1344274,40.965 19.9994286,41.966 19.9994286,43 C19.9994286,44.771 20.3584254,46.46 21.0024196,48 L21.0024196,48 Z M19.7434309,50 L17.0004554,50 L17.0004554,48 L18.8744386,48 C18.5344417,47.04 18.2894438,46.038 18.1494451,45 L15.4144695,45 L16.707458,46.293 L15.2924706,47.707 L12.2924974,44.707 C11.9025009,44.316 11.9025009,43.684 12.2924974,43.293 L15.2924706,40.293 L16.707458,41.707 L15.4144695,43 L18.0004464,43 C18.0004464,41.973 18.1044455,40.97 18.3024437,40 L17.0004554,40 L17.0004554,38 L18.8744386,38 C20.9404202,32.184 26.4833707,28 33.0003125,28 C37.427273,28 41.4002375,29.939 44.148213,33 L59.0000804,33 L59.0000804,35 L45.6661994,35 C47.1351863,37.318 47.9991786,40.058 47.9991786,43 L59.0000804,43 L59.0000804,45 L47.8501799,45 C46.8681887,52.327 40.5912447,58 33.0003125,58 C27.2563638,58 22.2624084,54.752 19.7434309,50 L19.7434309,50 Z M37.0002768,39 C37.0002768,38.448 36.5522808,38 36.0002857,38 L29.9993482,38 C29.4473442,38 28.9993482,38.448 28.9993482,39 L28.9993482,41 L31.0003304,41 L31.0003304,40 L32.0003214,40 L32.0003214,43 L31.0003304,43 L31.0003304,45 L35.0002946,45 L35.0002946,43 L34.0003036,43 L34.0003036,40 L35.0002946,40 L35.0002946,41 L37.0002768,41 L37.0002768,39 Z M49.0001696,40 L59.0000804,40 L59.0000804,38 L49.0001696,38 L49.0001696,40 Z M49.0001696,50 L59.0000804,50 L59.0000804,48 L49.0001696,48 L49.0001696,50 Z M57.0000982,27 L60.5850662,27 L57.0000982,23.414 L57.0000982,27 Z M63.7070383,27.293 C63.8940367,27.48 64.0000357,27.735 64.0000357,28 L64.0000357,63 C64.0000357,63.552 63.5520397,64 63.0000446,64 L32.0003304,64 C31.4473264,64 31.0003304,63.552 31.0003304,63 L31.0003304,59 L33.0003125,59 L33.0003125,62 L62.0000536,62 L62.0000536,29 L56.0001071,29 C55.4471121,29 55.0001161,28.552 55.0001161,28 L55.0001161,22 L33.0003125,22 L33.0003125,27 L31.0003304,27 L31.0003304,21 C31.0003304,20.448 31.4473264,20 32.0003304,20 L56.0001071,20 C56.2651048,20 56.5191025,20.105 56.7071008,20.293 L63.7070383,27.293 Z M68,24.166 L68,61 C68,61.552 67.552004,62 67.0000089,62 L65.0000268,62 L65.0000268,60 L66.0000179,60 L66.0000179,24.612 L58.6170838,18 L36.0002857,18 L36.0002857,19 L34.0003036,19 L34.0003036,17 C34.0003036,16.448 34.4472996,16 35.0003036,16 L59.0000804,16 C59.2460782,16 59.483076,16.091 59.6660744,16.255 L67.666003,23.42 C67.8780011,23.61 68,23.881 68,24.166 L68,24.166 Z'
-        fill='currentColor'
-      />
-    </svg>
-  )
-}
-
 export function McpIcon(props: SVGProps<SVGSVGElement>) {
  return (
    <svg
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -110,7 +110,6 @@ import {
  SupabaseIcon,
  TavilyIcon,
  TelegramIcon,
-  TextractIcon,
  TinybirdIcon,
  TranslateIcon,
  TrelloIcon,
@@ -144,7 +143,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  calendly: CalendlyIcon,
  circleback: CirclebackIcon,
  clay: ClayIcon,
-  confluence_v2: ConfluenceIcon,
+  confluence: ConfluenceIcon,
  cursor_v2: CursorIcon,
  datadog: DatadogIcon,
  discord: DiscordIcon,
@@ -154,7 +153,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  elasticsearch: ElasticsearchIcon,
  elevenlabs: ElevenLabsIcon,
  exa: ExaAIIcon,
-  file_v2: DocumentIcon,
+  file: DocumentIcon,
  firecrawl: FirecrawlIcon,
  fireflies: FirefliesIcon,
  github_v2: GithubIcon,
@@ -196,7 +195,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  microsoft_excel_v2: MicrosoftExcelIcon,
  microsoft_planner: MicrosoftPlannerIcon,
  microsoft_teams: MicrosoftTeamsIcon,
-  mistral_parse_v2: MistralIcon,
+  mistral_parse: MistralIcon,
  mongodb: MongoDBIcon,
  mysql: MySQLIcon,
  neo4j: Neo4jIcon,
@@ -238,7 +237,6 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  supabase: SupabaseIcon,
  tavily: TavilyIcon,
  telegram: TelegramIcon,
-  textract: TextractIcon,
  tinybird: TinybirdIcon,
  translate: TranslateIcon,
  trello: TrelloIcon,
@@ -246,7 +244,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  twilio_sms: TwilioIcon,
  twilio_voice: TwilioIcon,
  typeform: TypeformIcon,
-  video_generator_v2: VideoIcon,
+  video_generator: VideoIcon,
  vision: EyeIcon,
  wealthbox: WealthboxIcon,
  webflow: WebflowIcon,
--- a/apps/docs/content/docs/en/tools/confluence.mdx
+++ b/apps/docs/content/docs/en/tools/confluence.mdx
@@ -6,7 +6,7 @@ description: Interact with Confluence
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="confluence_v2"
+  type="confluence"
  color="#E0E0E0"
 />

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

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

@@ -48,7 +48,7 @@ Parse one or more uploaded files or files from URLs (text, PDF, CSV, images, etc

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


--- a/apps/docs/content/docs/en/tools/meta.json
+++ b/apps/docs/content/docs/en/tools/meta.json
@@ -106,7 +106,6 @@
    "supabase",
    "tavily",
    "telegram",
-    "textract",
    "tinybird",
    "translate",
    "trello",
--- a/apps/docs/content/docs/en/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/en/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: Extract text from PDF documents
 import { BlockInfoCard } from "@/components/ui/block-info-card"

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

@@ -54,37 +54,18 @@ Parse PDF documents using Mistral OCR API

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `pages` | array | Array of page objects from Mistral OCR |
-|   ↳ `index` | number | Page index \(zero-based\) |
-|   ↳ `markdown` | string | Extracted markdown content |
-|   ↳ `images` | array | Images extracted from this page with bounding boxes |
-|   ↳ `id` | string | Image identifier \(e.g., img-0.jpeg\) |
-|   ↳ `top_left_x` | number | Top-left X coordinate in pixels |
-|   ↳ `top_left_y` | number | Top-left Y coordinate in pixels |
-|   ↳ `bottom_right_x` | number | Bottom-right X coordinate in pixels |
-|   ↳ `bottom_right_y` | number | Bottom-right Y coordinate in pixels |
-|   ↳ `image_base64` | string | Base64-encoded image data \(when include_image_base64=true\) |
-|   ↳ `id` | string | Image identifier \(e.g., img-0.jpeg\) |
-|   ↳ `top_left_x` | number | Top-left X coordinate in pixels |
-|   ↳ `top_left_y` | number | Top-left Y coordinate in pixels |
-|   ↳ `bottom_right_x` | number | Bottom-right X coordinate in pixels |
-|   ↳ `bottom_right_y` | number | Bottom-right Y coordinate in pixels |
-|   ↳ `image_base64` | string | Base64-encoded image data \(when include_image_base64=true\) |
-|   ↳ `dimensions` | object | Page dimensions |
-|   ↳ `dpi` | number | Dots per inch |
-|   ↳ `height` | number | Page height in pixels |
-|   ↳ `width` | number | Page width in pixels |
-|   ↳ `dpi` | number | Dots per inch |
-|   ↳ `height` | number | Page height in pixels |
-|   ↳ `width` | number | Page width in pixels |
-|   ↳ `tables` | array | Extracted tables as HTML/markdown \(when table_format is set\). Referenced via placeholders like \[tbl-0.html\] |
-|   ↳ `hyperlinks` | array | Array of URL strings detected in the page \(e.g., \[ |
-|   ↳ `header` | string | Page header content \(when extract_header=true\) |
-|   ↳ `footer` | string | Page footer content \(when extract_footer=true\) |
-| `model` | string | Mistral OCR model identifier \(e.g., mistral-ocr-latest\) |
-| `usage_info` | object | Usage and processing statistics |
-| ↳ `pages_processed` | number | Total number of pages processed |
-| ↳ `doc_size_bytes` | number | Document file size in bytes |
-| `document_annotation` | string | Structured annotation data as JSON string \(when applicable\) |
+| `success` | boolean | Whether the PDF was parsed successfully |
+| `content` | string | Extracted content in the requested format \(markdown, text, or JSON\) |
+| `metadata` | object | Processing metadata including jobId, fileType, pageCount, and usage info |
+| ↳ `jobId` | string | Unique job identifier |
+| ↳ `fileType` | string | File type \(e.g., pdf\) |
+| ↳ `fileName` | string | Original file name |
+| ↳ `source` | string | Source type \(url\) |
+| ↳ `pageCount` | number | Number of pages processed |
+| ↳ `model` | string | Mistral model used |
+| ↳ `resultType` | string | Output format \(markdown, text, json\) |
+| ↳ `processedAt` | string | Processing timestamp |
+| ↳ `sourceUrl` | string | Source URL if applicable |
+| ↳ `usageInfo` | object | Usage statistics from OCR processing |


--- a/apps/docs/content/docs/en/tools/s3.mdx
+++ b/apps/docs/content/docs/en/tools/s3.mdx
@@ -58,7 +58,6 @@ Upload a file to an AWS S3 bucket
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `url` | string | URL of the uploaded S3 object |
-| `uri` | string | S3 URI of the uploaded object \(s3://bucket/key\) |
 | `metadata` | object | Upload metadata including ETag and location |

 ### `s3_get_object`
@@ -150,7 +149,6 @@ Copy an object within or between AWS S3 buckets
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `url` | string | URL of the copied S3 object |
-| `uri` | string | S3 URI of the copied object \(s3://bucket/key\) |
 | `metadata` | object | Copy operation metadata |


--- a/apps/docs/content/docs/en/tools/textract.mdx
+++ b/apps/docs/content/docs/en/tools/textract.mdx
@@ -1,120 +0,0 @@
---
-title: AWS Textract
-description: Extract text, tables, and forms from documents
---
-
-import { BlockInfoCard } from "@/components/ui/block-info-card"
-
-<BlockInfoCard 
-  type="textract"
-  color="linear-gradient(135deg, #055F4E 0%, #56C0A7 100%)"
-/>
-
-{/* MANUAL-CONTENT-START:intro */}
-[AWS Textract](https://aws.amazon.com/textract/) is a powerful AI service from Amazon Web Services designed to automatically extract printed text, handwriting, tables, forms, key-value pairs, and other structured data from scanned documents and images. Textract leverages advanced optical character recognition (OCR) and document analysis to transform documents into actionable data, enabling automation, analytics, compliance, and more.
-
-With AWS Textract, you can:
-
- **Extract text from images and documents**: Recognize printed text and handwriting in formats such as PDF, JPEG, PNG, or TIFF
- **Detect and extract tables**: Automatically find tables and output their structured content
- **Parse forms and key-value pairs**: Pull structured data from forms, including fields and their corresponding values
- **Identify signatures and layout features**: Detect signatures, geometric layout, and relationships between document elements
- **Customize extraction with queries**: Extract specific fields and answers using query-based extraction (e.g., "What is the invoice number?")
-
-In Sim, the AWS Textract integration empowers your agents to intelligently process documents as part of their workflows. This unlocks automation scenarios such as data entry from invoices, onboarding documents, contracts, receipts, and more. Your agents can extract relevant data, analyze structured forms, and generate summaries or reports directly from document uploads or URLs. By connecting Sim with AWS Textract, you can reduce manual effort, improve data accuracy, and streamline your business processes with robust document understanding.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Integrate AWS Textract into your workflow to extract text, tables, forms, and key-value pairs from documents. Single-page mode supports JPEG, PNG, and single-page PDF. Multi-page mode supports multi-page PDF and TIFF.
-
-
-
-## Tools
-
-### `textract_parser`
-
-Parse documents using AWS Textract OCR and document analysis
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `accessKeyId` | string | Yes | AWS Access Key ID |
-| `secretAccessKey` | string | Yes | AWS Secret Access Key |
-| `region` | string | Yes | AWS region for Textract service \(e.g., us-east-1\) |
-| `processingMode` | string | No | Document type: single-page or multi-page. Defaults to single-page. |
-| `filePath` | string | No | URL to a document to be processed \(JPEG, PNG, or single-page PDF\). |
-| `s3Uri` | string | No | S3 URI for multi-page processing \(s3://bucket/key\). |
-| `fileUpload` | object | No | File upload data from file-upload component |
-| `featureTypes` | array | No | Feature types to detect: TABLES, FORMS, QUERIES, SIGNATURES, LAYOUT. If not specified, only text detection is performed. |
-| `items` | string | No | Feature type |
-| `queries` | array | No | Custom queries to extract specific information. Only used when featureTypes includes QUERIES. |
-| `items` | object | No | Query configuration |
-| `properties` | string | No | The query text |
-| `Text` | string | No | No description |
-| `Alias` | string | No | No description |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `blocks` | array | Array of Block objects containing detected text, tables, forms, and other elements |
-|   ↳ `BlockType` | string | Type of block \(PAGE, LINE, WORD, TABLE, CELL, KEY_VALUE_SET, etc.\) |
-|   ↳ `Id` | string | Unique identifier for the block |
-|   ↳ `Text` | string | Query text |
-|   ↳ `TextType` | string | Type of text \(PRINTED or HANDWRITING\) |
-|   ↳ `Confidence` | number | Confidence score \(0-100\) |
-|   ↳ `Page` | number | Page number |
-|   ↳ `Geometry` | object | Location and bounding box information |
-|   ↳ `BoundingBox` | object | Height as ratio of document height |
-|   ↳ `Height` | number | Height as ratio of document height |
-|   ↳ `Left` | number | Left position as ratio of document width |
-|   ↳ `Top` | number | Top position as ratio of document height |
-|   ↳ `Width` | number | Width as ratio of document width |
-|   ↳ `Height` | number | Height as ratio of document height |
-|   ↳ `Left` | number | Left position as ratio of document width |
-|   ↳ `Top` | number | Top position as ratio of document height |
-|   ↳ `Width` | number | Width as ratio of document width |
-|   ↳ `Polygon` | array | Polygon coordinates |
-|   ↳ `X` | number | X coordinate |
-|   ↳ `Y` | number | Y coordinate |
-|   ↳ `X` | number | X coordinate |
-|   ↳ `Y` | number | Y coordinate |
-|   ↳ `BoundingBox` | object | Height as ratio of document height |
-|   ↳ `Height` | number | Height as ratio of document height |
-|   ↳ `Left` | number | Left position as ratio of document width |
-|   ↳ `Top` | number | Top position as ratio of document height |
-|   ↳ `Width` | number | Width as ratio of document width |
-|   ↳ `Height` | number | Height as ratio of document height |
-|   ↳ `Left` | number | Left position as ratio of document width |
-|   ↳ `Top` | number | Top position as ratio of document height |
-|   ↳ `Width` | number | Width as ratio of document width |
-|   ↳ `Polygon` | array | Polygon coordinates |
-|   ↳ `X` | number | X coordinate |
-|   ↳ `Y` | number | Y coordinate |
-|   ↳ `X` | number | X coordinate |
-|   ↳ `Y` | number | Y coordinate |
-|   ↳ `Relationships` | array | Relationships to other blocks |
-|   ↳ `Type` | string | Relationship type \(CHILD, VALUE, ANSWER, etc.\) |
-|   ↳ `Ids` | array | IDs of related blocks |
-|   ↳ `Type` | string | Relationship type \(CHILD, VALUE, ANSWER, etc.\) |
-|   ↳ `Ids` | array | IDs of related blocks |
-|   ↳ `EntityTypes` | array | Entity types for KEY_VALUE_SET \(KEY or VALUE\) |
-|   ↳ `SelectionStatus` | string | For checkboxes: SELECTED or NOT_SELECTED |
-|   ↳ `RowIndex` | number | Row index for table cells |
-|   ↳ `ColumnIndex` | number | Column index for table cells |
-|   ↳ `RowSpan` | number | Row span for merged cells |
-|   ↳ `ColumnSpan` | number | Column span for merged cells |
-|   ↳ `Query` | object | Query information for QUERY blocks |
-|   ↳ `Text` | string | Query text |
-|   ↳ `Alias` | string | Query alias |
-|   ↳ `Pages` | array | Pages to search |
-|   ↳ `Alias` | string | Query alias |
-|   ↳ `Pages` | array | Pages to search |
-| `documentMetadata` | object | Metadata about the analyzed document |
-| ↳ `pages` | number | Number of pages in the document |
-| `modelVersion` | string | Version of the Textract model used for processing |
-
-
--- a/apps/docs/content/docs/en/tools/video_generator.mdx
+++ b/apps/docs/content/docs/en/tools/video_generator.mdx
@@ -6,7 +6,7 @@ description: Generate videos from text using AI
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="video_generator_v2"
+  type="video_generator"
  color="#181C1E"
 />

--- a/apps/sim/app/(auth)/login/login-form.tsx
+++ b/apps/sim/app/(auth)/login/login-form.tsx
@@ -2,9 +2,10 @@

 import { useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { Eye, EyeOff } from 'lucide-react'
+import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
+import { Button } from '@/components/ui/button'
 import {
  Dialog,
  DialogContent,
@@ -21,10 +22,8 @@ import { getBaseUrl } from '@/lib/core/utils/urls'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'

 const logger = createLogger('LoginForm')

@@ -106,7 +105,8 @@ export default function LoginPage({
  const [password, setPassword] = useState('')
  const [passwordErrors, setPasswordErrors] = useState<string[]>([])
  const [showValidationError, setShowValidationError] = useState(false)
-  const buttonClass = useBrandedButtonClass()
+  const [buttonClass, setButtonClass] = useState('branded-button-gradient')
+  const [isButtonHovered, setIsButtonHovered] = useState(false)

  const [callbackUrl, setCallbackUrl] = useState('/workspace')
  const [isInviteFlow, setIsInviteFlow] = useState(false)
@@ -114,6 +114,7 @@ export default function LoginPage({
  const [forgotPasswordOpen, setForgotPasswordOpen] = useState(false)
  const [forgotPasswordEmail, setForgotPasswordEmail] = useState('')
  const [isSubmittingReset, setIsSubmittingReset] = useState(false)
+  const [isResetButtonHovered, setIsResetButtonHovered] = useState(false)
  const [resetStatus, setResetStatus] = useState<{
    type: 'success' | 'error' | null
    message: string
@@ -122,7 +123,6 @@ export default function LoginPage({
  const [email, setEmail] = useState('')
  const [emailErrors, setEmailErrors] = useState<string[]>([])
  const [showEmailValidationError, setShowEmailValidationError] = useState(false)
-  const [resetSuccessMessage, setResetSuccessMessage] = useState<string | null>(null)

  useEffect(() => {
    setMounted(true)
@@ -139,12 +139,32 @@ export default function LoginPage({

      const inviteFlow = searchParams.get('invite_flow') === 'true'
      setIsInviteFlow(inviteFlow)
+    }

-      const resetSuccess = searchParams.get('resetSuccess') === 'true'
-      if (resetSuccess) {
-        setResetSuccessMessage('Password reset successful. Please sign in with your new password.')
+    const checkCustomBrand = () => {
+      const computedStyle = getComputedStyle(document.documentElement)
+      const brandAccent = computedStyle.getPropertyValue('--brand-accent-hex').trim()
+
+      if (brandAccent && brandAccent !== '#6f3dfa') {
+        setButtonClass('branded-button-custom')
+      } else {
+        setButtonClass('branded-button-gradient')
      }
    }
+
+    checkCustomBrand()
+
+    window.addEventListener('resize', checkCustomBrand)
+    const observer = new MutationObserver(checkCustomBrand)
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    })
+
+    return () => {
+      window.removeEventListener('resize', checkCustomBrand)
+      observer.disconnect()
+    }
  }, [searchParams])

  useEffect(() => {
@@ -201,7 +221,6 @@ export default function LoginPage({

    try {
      const safeCallbackUrl = validateCallbackUrl(callbackUrl) ? callbackUrl : '/workspace'
-      let errorHandled = false

      const result = await client.signIn.email(
        {
@@ -212,16 +231,11 @@ export default function LoginPage({
        {
          onError: (ctx) => {
            logger.error('Login error:', ctx.error)
-
-            // EMAIL_NOT_VERIFIED is handled by the catch block which redirects to /verify
-            if (ctx.error.code?.includes('EMAIL_NOT_VERIFIED')) {
-              errorHandled = true
-              return
-            }
-
-            errorHandled = true
            const errorMessage: string[] = ['Invalid email or password']

+            if (ctx.error.code?.includes('EMAIL_NOT_VERIFIED')) {
+              return
+            }
            if (
              ctx.error.code?.includes('BAD_REQUEST') ||
              ctx.error.message?.includes('Email and password sign in is not enabled')
@@ -257,7 +271,6 @@ export default function LoginPage({
              errorMessage.push('Too many requests. Please wait a moment before trying again.')
            }

-            setResetSuccessMessage(null)
            setPasswordErrors(errorMessage)
            setShowValidationError(true)
          },
@@ -265,22 +278,9 @@ export default function LoginPage({
      )

      if (!result || result.error) {
-        // Show error if not already handled by onError callback
-        if (!errorHandled) {
-          setResetSuccessMessage(null)
-          const errorMessage = result?.error?.message || 'Login failed. Please try again.'
-          setPasswordErrors([errorMessage])
-          setShowValidationError(true)
-        }
        setIsLoading(false)
        return
      }
-
-      // Clear reset success message on successful login
-      setResetSuccessMessage(null)
-
-      // Explicit redirect fallback if better-auth doesn't redirect
-      router.push(safeCallbackUrl)
    } catch (err: any) {
      if (err.message?.includes('not verified') || err.code?.includes('EMAIL_NOT_VERIFIED')) {
        if (typeof window !== 'undefined') {
@@ -400,13 +400,6 @@ export default function LoginPage({
        </div>
      )}

-      {/* Password reset success message */}
-      {resetSuccessMessage && (
-        <div className={`${inter.className} mt-1 space-y-1 text-[#4CAF50] text-xs`}>
-          <p>{resetSuccessMessage}</p>
-        </div>
-      )}
-
      {/* Email/Password Form - show unless explicitly disabled */}
      {!isFalsy(getEnv('NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED')) && (
        <form onSubmit={onSubmit} className={`${inter.className} mt-8 space-y-8`}>
@@ -489,14 +482,24 @@ export default function LoginPage({
            </div>
          </div>

-          <BrandedButton
+          <Button
            type='submit'
+            onMouseEnter={() => setIsButtonHovered(true)}
+            onMouseLeave={() => setIsButtonHovered(false)}
+            className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
            disabled={isLoading}
-            loading={isLoading}
-            loadingText='Signing in'
          >
-            Sign in
-          </BrandedButton>
+            <span className='flex items-center gap-1'>
+              {isLoading ? 'Signing in...' : 'Sign in'}
+              <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+                {isButtonHovered ? (
+                  <ArrowRight className='h-4 w-4' aria-hidden='true' />
+                ) : (
+                  <ChevronRight className='h-4 w-4' aria-hidden='true' />
+                )}
+              </span>
+            </span>
+          </Button>
        </form>
      )}

@@ -607,15 +610,25 @@ export default function LoginPage({
                <p>{resetStatus.message}</p>
              </div>
            )}
-            <BrandedButton
+            <Button
              type='button'
              onClick={handleForgotPassword}
+              onMouseEnter={() => setIsResetButtonHovered(true)}
+              onMouseLeave={() => setIsResetButtonHovered(false)}
+              className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
              disabled={isSubmittingReset}
-              loading={isSubmittingReset}
-              loadingText='Sending'
            >
-              Send Reset Link
-            </BrandedButton>
+              <span className='flex items-center gap-1'>
+                {isSubmittingReset ? 'Sending...' : 'Send Reset Link'}
+                <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+                  {isResetButtonHovered ? (
+                    <ArrowRight className='h-4 w-4' aria-hidden='true' />
+                  ) : (
+                    <ChevronRight className='h-4 w-4' aria-hidden='true' />
+                  )}
+                </span>
+              </span>
+            </Button>
          </div>
        </DialogContent>
      </Dialog>
--- a/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
+++ b/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
@@ -1,12 +1,12 @@
 'use client'

-import { useState } from 'react'
-import { Eye, EyeOff } from 'lucide-react'
+import { useEffect, useState } from 'react'
+import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/core/utils/cn'
 import { inter } from '@/app/_styles/fonts/inter/inter'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'

 interface RequestResetFormProps {
  email: string
@@ -27,6 +27,36 @@ export function RequestResetForm({
  statusMessage,
  className,
 }: RequestResetFormProps) {
+  const [buttonClass, setButtonClass] = useState('branded-button-gradient')
+  const [isButtonHovered, setIsButtonHovered] = useState(false)
+
+  useEffect(() => {
+    const checkCustomBrand = () => {
+      const computedStyle = getComputedStyle(document.documentElement)
+      const brandAccent = computedStyle.getPropertyValue('--brand-accent-hex').trim()
+
+      if (brandAccent && brandAccent !== '#6f3dfa') {
+        setButtonClass('branded-button-custom')
+      } else {
+        setButtonClass('branded-button-gradient')
+      }
+    }
+
+    checkCustomBrand()
+
+    window.addEventListener('resize', checkCustomBrand)
+    const observer = new MutationObserver(checkCustomBrand)
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    })
+
+    return () => {
+      window.removeEventListener('resize', checkCustomBrand)
+      observer.disconnect()
+    }
+  }, [])
+
  const handleSubmit = async (e: React.FormEvent) => {
    e.preventDefault()
    onSubmit(email)
@@ -64,14 +94,24 @@ export function RequestResetForm({
        )}
      </div>

-      <BrandedButton
+      <Button
        type='submit'
        disabled={isSubmitting}
-        loading={isSubmitting}
-        loadingText='Sending'
+        onMouseEnter={() => setIsButtonHovered(true)}
+        onMouseLeave={() => setIsButtonHovered(false)}
+        className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
      >
-        Send Reset Link
-      </BrandedButton>
+        <span className='flex items-center gap-1'>
+          {isSubmitting ? 'Sending...' : 'Send Reset Link'}
+          <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+            {isButtonHovered ? (
+              <ArrowRight className='h-4 w-4' aria-hidden='true' />
+            ) : (
+              <ChevronRight className='h-4 w-4' aria-hidden='true' />
+            )}
+          </span>
+        </span>
+      </Button>
    </form>
  )
 }
@@ -98,6 +138,35 @@ export function SetNewPasswordForm({
  const [validationMessage, setValidationMessage] = useState('')
  const [showPassword, setShowPassword] = useState(false)
  const [showConfirmPassword, setShowConfirmPassword] = useState(false)
+  const [buttonClass, setButtonClass] = useState('branded-button-gradient')
+  const [isButtonHovered, setIsButtonHovered] = useState(false)
+
+  useEffect(() => {
+    const checkCustomBrand = () => {
+      const computedStyle = getComputedStyle(document.documentElement)
+      const brandAccent = computedStyle.getPropertyValue('--brand-accent-hex').trim()
+
+      if (brandAccent && brandAccent !== '#6f3dfa') {
+        setButtonClass('branded-button-custom')
+      } else {
+        setButtonClass('branded-button-gradient')
+      }
+    }
+
+    checkCustomBrand()
+
+    window.addEventListener('resize', checkCustomBrand)
+    const observer = new MutationObserver(checkCustomBrand)
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    })
+
+    return () => {
+      window.removeEventListener('resize', checkCustomBrand)
+      observer.disconnect()
+    }
+  }, [])

  const handleSubmit = async (e: React.FormEvent) => {
    e.preventDefault()
@@ -227,14 +296,24 @@ export function SetNewPasswordForm({
        )}
      </div>

-      <BrandedButton
-        type='submit'
+      <Button
        disabled={isSubmitting || !token}
-        loading={isSubmitting}
-        loadingText='Resetting'
+        type='submit'
+        onMouseEnter={() => setIsButtonHovered(true)}
+        onMouseLeave={() => setIsButtonHovered(false)}
+        className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
      >
-        Reset Password
-      </BrandedButton>
+        <span className='flex items-center gap-1'>
+          {isSubmitting ? 'Resetting...' : 'Reset Password'}
+          <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+            {isButtonHovered ? (
+              <ArrowRight className='h-4 w-4' aria-hidden='true' />
+            ) : (
+              <ChevronRight className='h-4 w-4' aria-hidden='true' />
+            )}
+          </span>
+        </span>
+      </Button>
    </form>
  )
 }
--- a/apps/sim/app/(auth)/signup/signup-form.tsx
+++ b/apps/sim/app/(auth)/signup/signup-form.tsx
@@ -2,9 +2,10 @@

 import { Suspense, useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { Eye, EyeOff } from 'lucide-react'
+import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { client, useSession } from '@/lib/auth/auth-client'
@@ -13,10 +14,8 @@ import { cn } from '@/lib/core/utils/cn'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'

 const logger = createLogger('SignupForm')

@@ -96,7 +95,8 @@ function SignupFormContent({
  const [showEmailValidationError, setShowEmailValidationError] = useState(false)
  const [redirectUrl, setRedirectUrl] = useState('')
  const [isInviteFlow, setIsInviteFlow] = useState(false)
-  const buttonClass = useBrandedButtonClass()
+  const [buttonClass, setButtonClass] = useState('branded-button-gradient')
+  const [isButtonHovered, setIsButtonHovered] = useState(false)

  const [name, setName] = useState('')
  const [nameErrors, setNameErrors] = useState<string[]>([])
@@ -126,6 +126,31 @@ function SignupFormContent({
    if (inviteFlowParam === 'true') {
      setIsInviteFlow(true)
    }
+
+    const checkCustomBrand = () => {
+      const computedStyle = getComputedStyle(document.documentElement)
+      const brandAccent = computedStyle.getPropertyValue('--brand-accent-hex').trim()
+
+      if (brandAccent && brandAccent !== '#6f3dfa') {
+        setButtonClass('branded-button-custom')
+      } else {
+        setButtonClass('branded-button-gradient')
+      }
+    }
+
+    checkCustomBrand()
+
+    window.addEventListener('resize', checkCustomBrand)
+    const observer = new MutationObserver(checkCustomBrand)
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    })
+
+    return () => {
+      window.removeEventListener('resize', checkCustomBrand)
+      observer.disconnect()
+    }
  }, [searchParams])

  const validatePassword = (passwordValue: string): string[] => {
@@ -475,14 +500,24 @@ function SignupFormContent({
            </div>
          </div>

-          <BrandedButton
+          <Button
            type='submit'
+            onMouseEnter={() => setIsButtonHovered(true)}
+            onMouseLeave={() => setIsButtonHovered(false)}
+            className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
            disabled={isLoading}
-            loading={isLoading}
-            loadingText='Creating account'
          >
-            Create account
-          </BrandedButton>
+            <span className='flex items-center gap-1'>
+              {isLoading ? 'Creating account' : 'Create account'}
+              <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+                {isButtonHovered ? (
+                  <ArrowRight className='h-4 w-4' aria-hidden='true' />
+                ) : (
+                  <ChevronRight className='h-4 w-4' aria-hidden='true' />
+                )}
+              </span>
+            </span>
+          </Button>
        </form>
      )}

--- a/apps/sim/app/(auth)/sso/sso-form.tsx
+++ b/apps/sim/app/(auth)/sso/sso-form.tsx
@@ -13,7 +13,6 @@ import { cn } from '@/lib/core/utils/cn'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'

 const logger = createLogger('SSOForm')

@@ -58,7 +57,7 @@ export default function SSOForm() {
  const [email, setEmail] = useState('')
  const [emailErrors, setEmailErrors] = useState<string[]>([])
  const [showEmailValidationError, setShowEmailValidationError] = useState(false)
-  const buttonClass = useBrandedButtonClass()
+  const [buttonClass, setButtonClass] = useState('branded-button-gradient')
  const [callbackUrl, setCallbackUrl] = useState('/workspace')

  useEffect(() => {
@@ -91,6 +90,31 @@ export default function SSOForm() {
        setShowEmailValidationError(true)
      }
    }
+
+    const checkCustomBrand = () => {
+      const computedStyle = getComputedStyle(document.documentElement)
+      const brandAccent = computedStyle.getPropertyValue('--brand-accent-hex').trim()
+
+      if (brandAccent && brandAccent !== '#6f3dfa') {
+        setButtonClass('branded-button-custom')
+      } else {
+        setButtonClass('branded-button-gradient')
+      }
+    }
+
+    checkCustomBrand()
+
+    window.addEventListener('resize', checkCustomBrand)
+    const observer = new MutationObserver(checkCustomBrand)
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    })
+
+    return () => {
+      window.removeEventListener('resize', checkCustomBrand)
+      observer.disconnect()
+    }
  }, [searchParams])

  const handleEmailChange = (e: React.ChangeEvent<HTMLInputElement>) => {
--- a/apps/sim/app/(auth)/verify/verify-content.tsx
+++ b/apps/sim/app/(auth)/verify/verify-content.tsx
@@ -8,7 +8,6 @@ import { cn } from '@/lib/core/utils/cn'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { useVerification } from '@/app/(auth)/verify/use-verification'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'

 interface VerifyContentProps {
  hasEmailService: boolean
@@ -59,7 +58,34 @@ function VerificationForm({
    setCountdown(30)
  }

-  const buttonClass = useBrandedButtonClass()
+  const [buttonClass, setButtonClass] = useState('branded-button-gradient')
+
+  useEffect(() => {
+    const checkCustomBrand = () => {
+      const computedStyle = getComputedStyle(document.documentElement)
+      const brandAccent = computedStyle.getPropertyValue('--brand-accent-hex').trim()
+
+      if (brandAccent && brandAccent !== '#6f3dfa') {
+        setButtonClass('branded-button-custom')
+      } else {
+        setButtonClass('branded-button-gradient')
+      }
+    }
+
+    checkCustomBrand()
+
+    window.addEventListener('resize', checkCustomBrand)
+    const observer = new MutationObserver(checkCustomBrand)
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    })
+
+    return () => {
+      window.removeEventListener('resize', checkCustomBrand)
+      observer.disconnect()
+    }
+  }, [])

  return (
    <>
--- a/apps/sim/app/(landing)/careers/page.tsx
+++ b/apps/sim/app/(landing)/careers/page.tsx
@@ -4,6 +4,7 @@ import { useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { X } from 'lucide-react'
 import { Textarea } from '@/components/emcn'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import {
@@ -17,7 +18,6 @@ import { isHosted } from '@/lib/core/config/feature-flags'
 import { cn } from '@/lib/core/utils/cn'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Nav from '@/app/(landing)/components/nav/nav'

@@ -493,17 +493,18 @@ export default function CareersPage() {

              {/* Submit Button */}
              <div className='flex justify-end pt-2'>
-                <BrandedButton
+                <Button
                  type='submit'
                  disabled={isSubmitting || submitStatus === 'success'}
-                  loading={isSubmitting}
-                  loadingText='Submitting'
-                  showArrow={false}
-                  fullWidth={false}
-                  className='min-w-[200px]'
+                  className='min-w-[200px] rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all duration-300 hover:opacity-90 disabled:opacity-50'
+                  size='lg'
                >
-                  {submitStatus === 'success' ? 'Submitted' : 'Submit Application'}
-                </BrandedButton>
+                  {isSubmitting
+                    ? 'Submitting...'
+                    : submitStatus === 'success'
+                      ? 'Submitted'
+                      : 'Submit Application'}
+                </Button>
              </div>
            </form>
          </section>
--- a/apps/sim/app/(landing)/components/nav/nav.tsx
+++ b/apps/sim/app/(landing)/components/nav/nav.tsx
@@ -11,7 +11,6 @@ import { useBrandConfig } from '@/lib/branding/branding'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'

 const logger = createLogger('nav')

@@ -21,12 +20,11 @@ interface NavProps {
 }

 export default function Nav({ hideAuthButtons = false, variant = 'landing' }: NavProps = {}) {
-  const [githubStars, setGithubStars] = useState('25.8k')
+  const [githubStars, setGithubStars] = useState('25.1k')
  const [isHovered, setIsHovered] = useState(false)
  const [isLoginHovered, setIsLoginHovered] = useState(false)
  const router = useRouter()
  const brand = useBrandConfig()
-  const buttonClass = useBrandedButtonClass()

  useEffect(() => {
    if (variant !== 'landing') return
@@ -185,7 +183,7 @@ export default function Nav({ hideAuthButtons = false, variant = 'landing' }: Na
            href='/signup'
            onMouseEnter={() => setIsHovered(true)}
            onMouseLeave={() => setIsHovered(false)}
-            className={`${buttonClass} group inline-flex items-center justify-center gap-2 rounded-[10px] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white transition-all`}
+            className='group inline-flex items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[14px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all sm:text-[16px]'
            aria-label='Get started with Sim - Sign up for free'
            prefetch={true}
          >
--- a/apps/sim/app/api/auth/oauth/utils.ts
+++ b/apps/sim/app/api/auth/oauth/utils.ts
@@ -7,26 +7,6 @@ import { refreshOAuthToken } from '@/lib/oauth'

 const logger = createLogger('OAuthUtilsAPI')

-const MICROSOFT_REFRESH_TOKEN_LIFETIME_DAYS = 90
-const PROACTIVE_REFRESH_THRESHOLD_DAYS = 7
-
-const MICROSOFT_PROVIDERS = new Set([
-  'microsoft-excel',
-  'microsoft-planner',
-  'microsoft-teams',
-  'outlook',
-  'onedrive',
-  'sharepoint',
-])
-
-function isMicrosoftProvider(providerId: string): boolean {
-  return MICROSOFT_PROVIDERS.has(providerId)
-}
-
-function getMicrosoftRefreshTokenExpiry(): Date {
-  return new Date(Date.now() + MICROSOFT_REFRESH_TOKEN_LIFETIME_DAYS * 24 * 60 * 60 * 1000)
-}
-
 interface AccountInsertData {
  id: string
  userId: string
@@ -225,32 +205,15 @@ export async function refreshAccessTokenIfNeeded(
  }

  // Decide if we should refresh: token missing OR expired
-  const accessTokenExpiresAt = credential.accessTokenExpiresAt
-  const refreshTokenExpiresAt = credential.refreshTokenExpiresAt
+  const expiresAt = credential.accessTokenExpiresAt
  const now = new Date()
-
-  // Check if access token needs refresh (missing or expired)
-  const accessTokenNeedsRefresh =
-    !!credential.refreshToken &&
-    (!credential.accessToken || (accessTokenExpiresAt && accessTokenExpiresAt <= now))
-
-  // Check if we should proactively refresh to prevent refresh token expiry
-  // This applies to Microsoft providers whose refresh tokens expire after 90 days of inactivity
-  const proactiveRefreshThreshold = new Date(
-    now.getTime() + PROACTIVE_REFRESH_THRESHOLD_DAYS * 24 * 60 * 60 * 1000
-  )
-  const refreshTokenNeedsProactiveRefresh =
-    !!credential.refreshToken &&
-    isMicrosoftProvider(credential.providerId) &&
-    refreshTokenExpiresAt &&
-    refreshTokenExpiresAt <= proactiveRefreshThreshold
-
-  const shouldRefresh = accessTokenNeedsRefresh || refreshTokenNeedsProactiveRefresh
+  const shouldRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (expiresAt && expiresAt <= now))

  const accessToken = credential.accessToken

  if (shouldRefresh) {
-    logger.info(`[${requestId}] Refreshing token for credential`)
+    logger.info(`[${requestId}] Token expired, attempting to refresh for credential`)
    try {
      const refreshedToken = await refreshOAuthToken(
        credential.providerId,
@@ -268,7 +231,7 @@ export async function refreshAccessTokenIfNeeded(
      }

      // Prepare update data
-      const updateData: Record<string, unknown> = {
+      const updateData: any = {
        accessToken: refreshedToken.accessToken,
        accessTokenExpiresAt: new Date(Date.now() + refreshedToken.expiresIn * 1000),
        updatedAt: new Date(),
@@ -280,10 +243,6 @@ export async function refreshAccessTokenIfNeeded(
        updateData.refreshToken = refreshedToken.refreshToken
      }

-      if (isMicrosoftProvider(credential.providerId)) {
-        updateData.refreshTokenExpiresAt = getMicrosoftRefreshTokenExpiry()
-      }
-
      // Update the token in the database
      await db.update(account).set(updateData).where(eq(account.id, credentialId))

@@ -318,27 +277,10 @@ export async function refreshTokenIfNeeded(
  credentialId: string
 ): Promise<{ accessToken: string; refreshed: boolean }> {
  // Decide if we should refresh: token missing OR expired
-  const accessTokenExpiresAt = credential.accessTokenExpiresAt
-  const refreshTokenExpiresAt = credential.refreshTokenExpiresAt
+  const expiresAt = credential.accessTokenExpiresAt
  const now = new Date()
-
-  // Check if access token needs refresh (missing or expired)
-  const accessTokenNeedsRefresh =
-    !!credential.refreshToken &&
-    (!credential.accessToken || (accessTokenExpiresAt && accessTokenExpiresAt <= now))
-
-  // Check if we should proactively refresh to prevent refresh token expiry
-  // This applies to Microsoft providers whose refresh tokens expire after 90 days of inactivity
-  const proactiveRefreshThreshold = new Date(
-    now.getTime() + PROACTIVE_REFRESH_THRESHOLD_DAYS * 24 * 60 * 60 * 1000
-  )
-  const refreshTokenNeedsProactiveRefresh =
-    !!credential.refreshToken &&
-    isMicrosoftProvider(credential.providerId) &&
-    refreshTokenExpiresAt &&
-    refreshTokenExpiresAt <= proactiveRefreshThreshold
-
-  const shouldRefresh = accessTokenNeedsRefresh || refreshTokenNeedsProactiveRefresh
+  const shouldRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (expiresAt && expiresAt <= now))

  // If token appears valid and present, return it directly
  if (!shouldRefresh) {
@@ -357,7 +299,7 @@ export async function refreshTokenIfNeeded(
    const { accessToken: refreshedToken, expiresIn, refreshToken: newRefreshToken } = refreshResult

    // Prepare update data
-    const updateData: Record<string, unknown> = {
+    const updateData: any = {
      accessToken: refreshedToken,
      accessTokenExpiresAt: new Date(Date.now() + expiresIn * 1000), // Use provider's expiry
      updatedAt: new Date(),
@@ -369,10 +311,6 @@ export async function refreshTokenIfNeeded(
      updateData.refreshToken = newRefreshToken
    }

-    if (isMicrosoftProvider(credential.providerId)) {
-      updateData.refreshTokenExpiresAt = getMicrosoftRefreshTokenExpiry()
-    }
-
    await db.update(account).set(updateData).where(eq(account.id, credentialId))

    logger.info(`[${requestId}] Successfully refreshed access token`)
--- a/apps/sim/app/api/auth/reset-password/route.ts
+++ b/apps/sim/app/api/auth/reset-password/route.ts
@@ -15,8 +15,7 @@ const resetPasswordSchema = z.object({
    .max(100, 'Password must not exceed 100 characters')
    .regex(/[A-Z]/, 'Password must contain at least one uppercase letter')
    .regex(/[a-z]/, 'Password must contain at least one lowercase letter')
-    .regex(/[0-9]/, 'Password must contain at least one number')
-    .regex(/[^A-Za-z0-9]/, 'Password must contain at least one special character'),
+    .regex(/[0-9]/, 'Password must contain at least one number'),
 })

 export async function POST(request: NextRequest) {
--- 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/chat/[chatId]/active-stream/route.ts
+++ b/apps/sim/app/api/copilot/chat/[chatId]/active-stream/route.ts
@@ -0,0 +1,86 @@
+/**
+ * GET /api/copilot/chat/[chatId]/active-stream
+ *
+ * Check if a chat has an active stream that can be resumed.
+ * Used by the client on page load to detect if there's an in-progress stream.
+ */
+
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { getSession } from '@/lib/auth'
+import {
+  getActiveStreamForChat,
+  getChunkCount,
+  getStreamMeta,
+} from '@/lib/copilot/stream-persistence'
+
+const logger = createLogger('CopilotActiveStreamAPI')
+
+export async function GET(
+  req: NextRequest,
+  { params }: { params: Promise<{ chatId: string }> }
+) {
+  const session = await getSession()
+  if (!session?.user?.id) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const { chatId } = await params
+
+  logger.info('Active stream check', { chatId, userId: session.user.id })
+
+  // Look up active stream ID from Redis
+  const streamId = await getActiveStreamForChat(chatId)
+
+  if (!streamId) {
+    logger.debug('No active stream found', { chatId })
+    return NextResponse.json({ hasActiveStream: false })
+  }
+
+  // Get stream metadata
+  const meta = await getStreamMeta(streamId)
+
+  if (!meta) {
+    logger.debug('Stream metadata not found', { streamId, chatId })
+    return NextResponse.json({ hasActiveStream: false })
+  }
+
+  // Verify the stream is still active
+  if (meta.status !== 'streaming') {
+    logger.debug('Stream not active', { streamId, chatId, status: meta.status })
+    return NextResponse.json({ hasActiveStream: false })
+  }
+
+  // Verify ownership
+  if (meta.userId !== session.user.id) {
+    logger.warn('Stream belongs to different user', {
+      streamId,
+      chatId,
+      requesterId: session.user.id,
+      ownerId: meta.userId,
+    })
+    return NextResponse.json({ hasActiveStream: false })
+  }
+
+  // Get current chunk count for client to track progress
+  const chunkCount = await getChunkCount(streamId)
+
+  logger.info('Active stream found', {
+    streamId,
+    chatId,
+    chunkCount,
+    toolCallsCount: meta.toolCalls.length,
+  })
+
+  return NextResponse.json({
+    hasActiveStream: true,
+    streamId,
+    chunkCount,
+    toolCalls: meta.toolCalls.filter(
+      (tc) => tc.state === 'pending' || tc.state === 'executing'
+    ),
+    createdAt: meta.createdAt,
+    updatedAt: meta.updatedAt,
+  })
+}
+
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { copilotChats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, desc, eq } from 'drizzle-orm'
+import { after } from 'next/server'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
@@ -16,6 +17,21 @@ import {
  createRequestTracker,
  createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
+import {
+  type RenderEvent,
+  serializeRenderEvent,
+} from '@/lib/copilot/render-events'
+import {
+  appendChunk,
+  appendContent,
+  checkAbortSignal,
+  completeStream,
+  createStream,
+  errorStream,
+  refreshStreamTTL,
+  updateToolCall,
+} from '@/lib/copilot/stream-persistence'
+import { transformStream } from '@/lib/copilot/stream-transformer'
 import { getCredentialsServerTool } from '@/lib/copilot/tools/server/user/get-credentials'
 import type { CopilotProviderConfig } from '@/lib/copilot/types'
 import { env } from '@/lib/core/config/env'
@@ -492,385 +508,205 @@ export async function POST(req: NextRequest) {
      )
    }

-    // If streaming is requested, forward the stream and update chat later
+    // If streaming is requested, start background processing and return streamId immediately
    if (stream && simAgentResponse.body) {
-      // Create user message to save
-      const userMessage = {
-        id: userMessageIdToUse, // Consistent ID used for request and persistence
-        role: 'user',
-        content: message,
-        timestamp: new Date().toISOString(),
-        ...(fileAttachments && fileAttachments.length > 0 && { fileAttachments }),
-        ...(Array.isArray(contexts) && contexts.length > 0 && { contexts }),
-        ...(Array.isArray(contexts) &&
-          contexts.length > 0 && {
-            contentBlocks: [{ type: 'contexts', contexts: contexts as any, timestamp: Date.now() }],
-          }),
+      // Create stream ID for persistence and resumption
+      const streamId = crypto.randomUUID()
+
+      // Initialize stream state in Redis
+      await createStream({
+        streamId,
+        chatId: actualChatId!,
+        userId: authenticatedUserId,
+        workflowId,
+        userMessageId: userMessageIdToUse,
+        isClientSession: true,
+      })
+
+      // Save user message to database immediately so it's available on refresh
+      // This is critical for stream resumption - user message must be persisted before stream starts
+      if (currentChat) {
+        const existingMessages = Array.isArray(currentChat.messages) ? currentChat.messages : []
+        const userMessage = {
+          id: userMessageIdToUse,
+          role: 'user',
+          content: message,
+          timestamp: new Date().toISOString(),
+          ...(fileAttachments && fileAttachments.length > 0 && { fileAttachments }),
+          ...(Array.isArray(contexts) && contexts.length > 0 && { contexts }),
+          ...(Array.isArray(contexts) &&
+            contexts.length > 0 && {
+              contentBlocks: [{ type: 'contexts', contexts: contexts as any, timestamp: Date.now() }],
+            }),
+        }
+
+        await db
+          .update(copilotChats)
+          .set({
+            messages: [...existingMessages, userMessage],
+            updatedAt: new Date(),
+          })
+          .where(eq(copilotChats.id, actualChatId!))
+
+        logger.info(`[${tracker.requestId}] Saved user message before streaming`, {
+          chatId: actualChatId,
+          messageId: userMessageIdToUse,
+        })
      }

-      // Create a pass-through stream that captures the response
-      const transformedStream = new ReadableStream({
-        async start(controller) {
-          const encoder = new TextEncoder()
-          let assistantContent = ''
-          const toolCalls: any[] = []
-          let buffer = ''
-          const isFirstDone = true
-          let responseIdFromStart: string | undefined
-          let responseIdFromDone: string | undefined
-          // Track tool call progress to identify a safe done event
-          const announcedToolCallIds = new Set<string>()
-          const startedToolExecutionIds = new Set<string>()
-          const completedToolExecutionIds = new Set<string>()
-          let lastDoneResponseId: string | undefined
-          let lastSafeDoneResponseId: string | undefined
+      // Track last TTL refresh time
+      const TTL_REFRESH_INTERVAL = 60000 // Refresh TTL every minute

-          // Send chatId as first event
-          if (actualChatId) {
-            const chatIdEvent = `data: ${JSON.stringify({
-              type: 'chat_id',
-              chatId: actualChatId,
-            })}\n\n`
-            controller.enqueue(encoder.encode(chatIdEvent))
-            logger.debug(`[${tracker.requestId}] Sent initial chatId event to client`)
-          }
+      // Capture needed values for background task
+      const capturedChatId = actualChatId!
+      const capturedCurrentChat = currentChat

-          // Start title generation in parallel if needed
-          if (actualChatId && !currentChat?.title && conversationHistory.length === 0) {
-            generateChatTitle(message)
-              .then(async (title) => {
-                if (title) {
-                  await db
-                    .update(copilotChats)
-                    .set({
-                      title,
-                      updatedAt: new Date(),
-                    })
-                    .where(eq(copilotChats.id, actualChatId!))
+      // Generate assistant message ID upfront
+      const assistantMessageId = crypto.randomUUID()

-                  const titleEvent = `data: ${JSON.stringify({
-                    type: 'title_updated',
-                    title: title,
-                  })}\n\n`
-                  controller.enqueue(encoder.encode(titleEvent))
-                  logger.info(`[${tracker.requestId}] Generated and saved title: ${title}`)
-                }
-              })
-              .catch((error) => {
-                logger.error(`[${tracker.requestId}] Title generation failed:`, error)
-              })
-          } else {
-            logger.debug(`[${tracker.requestId}] Skipping title generation`)
-          }
-
-          // Forward the sim agent stream and capture assistant response
-          const reader = simAgentResponse.body!.getReader()
-          const decoder = new TextDecoder()
-
-          try {
-            while (true) {
-              const { done, value } = await reader.read()
-              if (done) {
-                break
-              }
-
-              // Decode and parse SSE events for logging and capturing content
-              const decodedChunk = decoder.decode(value, { stream: true })
-              buffer += decodedChunk
-
-              const lines = buffer.split('\n')
-              buffer = lines.pop() || '' // Keep incomplete line in buffer
-
-              for (const line of lines) {
-                if (line.trim() === '') continue // Skip empty lines
-
-                if (line.startsWith('data: ') && line.length > 6) {
-                  try {
-                    const jsonStr = line.slice(6)
-
-                    // Check if the JSON string is unusually large (potential streaming issue)
-                    if (jsonStr.length > 50000) {
-                      // 50KB limit
-                      logger.warn(`[${tracker.requestId}] Large SSE event detected`, {
-                        size: jsonStr.length,
-                        preview: `${jsonStr.substring(0, 100)}...`,
-                      })
-                    }
-
-                    const event = JSON.parse(jsonStr)
-
-                    // Log different event types comprehensively
-                    switch (event.type) {
-                      case 'content':
-                        if (event.data) {
-                          assistantContent += event.data
-                        }
-                        break
-
-                      case 'reasoning':
-                        logger.debug(
-                          `[${tracker.requestId}] Reasoning chunk received (${(event.data || event.content || '').length} chars)`
-                        )
-                        break
-
-                      case 'tool_call':
-                        if (!event.data?.partial) {
-                          toolCalls.push(event.data)
-                          if (event.data?.id) {
-                            announcedToolCallIds.add(event.data.id)
-                          }
-                        }
-                        break
-
-                      case 'tool_generating':
-                        if (event.toolCallId) {
-                          startedToolExecutionIds.add(event.toolCallId)
-                        }
-                        break
-
-                      case 'tool_result':
-                        if (event.toolCallId) {
-                          completedToolExecutionIds.add(event.toolCallId)
-                        }
-                        break
-
-                      case 'tool_error':
-                        logger.error(`[${tracker.requestId}] Tool error:`, {
-                          toolCallId: event.toolCallId,
-                          toolName: event.toolName,
-                          error: event.error,
-                          success: event.success,
-                        })
-                        if (event.toolCallId) {
-                          completedToolExecutionIds.add(event.toolCallId)
-                        }
-                        break
-
-                      case 'start':
-                        if (event.data?.responseId) {
-                          responseIdFromStart = event.data.responseId
-                        }
-                        break
-
-                      case 'done':
-                        if (event.data?.responseId) {
-                          responseIdFromDone = event.data.responseId
-                          lastDoneResponseId = responseIdFromDone
-
-                          // Mark this done as safe only if no tool call is currently in progress or pending
-                          const announced = announcedToolCallIds.size
-                          const completed = completedToolExecutionIds.size
-                          const started = startedToolExecutionIds.size
-                          const hasToolInProgress = announced > completed || started > completed
-                          if (!hasToolInProgress) {
-                            lastSafeDoneResponseId = responseIdFromDone
-                          }
-                        }
-                        break
-
-                      case 'error':
-                        break
-
-                      default:
-                    }
-
-                    // Emit to client: rewrite 'error' events into user-friendly assistant message
-                    if (event?.type === 'error') {
-                      try {
-                        const displayMessage: string =
-                          (event?.data && (event.data.displayMessage as string)) ||
-                          'Sorry, I encountered an error. Please try again.'
-                        const formatted = `_${displayMessage}_`
-                        // Accumulate so it persists to DB as assistant content
-                        assistantContent += formatted
-                        // Send as content chunk
-                        try {
-                          controller.enqueue(
-                            encoder.encode(
-                              `data: ${JSON.stringify({ type: 'content', data: formatted })}\n\n`
-                            )
-                          )
-                        } catch (enqueueErr) {
-                          reader.cancel()
-                          break
-                        }
-                        // Then close this response cleanly for the client
-                        try {
-                          controller.enqueue(
-                            encoder.encode(`data: ${JSON.stringify({ type: 'done' })}\n\n`)
-                          )
-                        } catch (enqueueErr) {
-                          reader.cancel()
-                          break
-                        }
-                      } catch {}
-                      // Do not forward the original error event
-                    } else {
-                      // Forward original event to client
-                      try {
-                        controller.enqueue(encoder.encode(`data: ${jsonStr}\n\n`))
-                      } catch (enqueueErr) {
-                        reader.cancel()
-                        break
-                      }
-                    }
-                  } catch (e) {
-                    // Enhanced error handling for large payloads and parsing issues
-                    const lineLength = line.length
-                    const isLargePayload = lineLength > 10000
-
-                    if (isLargePayload) {
-                      logger.error(
-                        `[${tracker.requestId}] Failed to parse large SSE event (${lineLength} chars)`,
-                        {
-                          error: e,
-                          preview: `${line.substring(0, 200)}...`,
-                          size: lineLength,
-                        }
-                      )
-                    } else {
-                      logger.warn(
-                        `[${tracker.requestId}] Failed to parse SSE event: "${line.substring(0, 200)}..."`,
-                        e
-                      )
-                    }
-                  }
-                } else if (line.trim() && line !== 'data: [DONE]') {
-                  logger.debug(`[${tracker.requestId}] Non-SSE line from sim agent: "${line}"`)
-                }
-              }
-            }
-
-            // Process any remaining buffer
-            if (buffer.trim()) {
-              logger.debug(`[${tracker.requestId}] Processing remaining buffer: "${buffer}"`)
-              if (buffer.startsWith('data: ')) {
-                try {
-                  const jsonStr = buffer.slice(6)
-                  const event = JSON.parse(jsonStr)
-                  if (event.type === 'content' && event.data) {
-                    assistantContent += event.data
-                  }
-                  // Forward remaining event, applying same error rewrite behavior
-                  if (event?.type === 'error') {
-                    const displayMessage: string =
-                      (event?.data && (event.data.displayMessage as string)) ||
-                      'Sorry, I encountered an error. Please try again.'
-                    const formatted = `_${displayMessage}_`
-                    assistantContent += formatted
-                    try {
-                      controller.enqueue(
-                        encoder.encode(
-                          `data: ${JSON.stringify({ type: 'content', data: formatted })}\n\n`
-                        )
-                      )
-                      controller.enqueue(
-                        encoder.encode(`data: ${JSON.stringify({ type: 'done' })}\n\n`)
-                      )
-                    } catch (enqueueErr) {
-                      reader.cancel()
-                    }
-                  } else {
-                    try {
-                      controller.enqueue(encoder.encode(`data: ${jsonStr}\n\n`))
-                    } catch (enqueueErr) {
-                      reader.cancel()
-                    }
-                  }
-                } catch (e) {
-                  logger.warn(`[${tracker.requestId}] Failed to parse final buffer: "${buffer}"`)
-                }
-              }
-            }
-
-            // Log final streaming summary
-            logger.info(`[${tracker.requestId}] Streaming complete summary:`, {
-              totalContentLength: assistantContent.length,
-              toolCallsCount: toolCalls.length,
-              hasContent: assistantContent.length > 0,
-              toolNames: toolCalls.map((tc) => tc?.name).filter(Boolean),
-            })
-
-            // NOTE: Messages are saved by the client via update-messages endpoint with full contentBlocks.
-            // Server only updates conversationId here to avoid overwriting client's richer save.
-            if (currentChat) {
-              // Persist only a safe conversationId to avoid continuing from a state that expects tool outputs
-              const previousConversationId = currentChat?.conversationId as string | undefined
-              const responseId = lastSafeDoneResponseId || previousConversationId || undefined
-
-              if (responseId) {
+      // Start background processing task using the stream transformer
+      // This processes the Sim Agent stream, executes tools, and emits render events
+      // Client will connect to /api/copilot/stream/{streamId} for live updates
+      const backgroundTask = (async () => {
+        // Start title generation if needed (runs in parallel)
+        if (capturedChatId && !capturedCurrentChat?.title && conversationHistory.length === 0) {
+          generateChatTitle(message)
+            .then(async (title) => {
+              if (title) {
                await db
                  .update(copilotChats)
-                  .set({
-                    updatedAt: new Date(),
-                    conversationId: responseId,
-                  })
-                  .where(eq(copilotChats.id, actualChatId!))
-
-                logger.info(
-                  `[${tracker.requestId}] Updated conversationId for chat ${actualChatId}`,
-                  {
-                    updatedConversationId: responseId,
-                  }
-                )
+                  .set({ title, updatedAt: new Date() })
+                  .where(eq(copilotChats.id, capturedChatId))
+                logger.info(`[${tracker.requestId}] Generated and saved title: ${title}`)
              }
-            }
-          } catch (error) {
-            logger.error(`[${tracker.requestId}] Error processing stream:`, error)
+            })
+            .catch((error) => {
+              logger.error(`[${tracker.requestId}] Title generation failed:`, error)
+            })
+        }

-            // Send an error event to the client before closing so it knows what happened
-            try {
-              const errorMessage =
-                error instanceof Error && error.message === 'terminated'
-                  ? 'Connection to AI service was interrupted. Please try again.'
-                  : 'An unexpected error occurred while processing the response.'
-              const encoder = new TextEncoder()
+        // Track accumulated content for final persistence
+        let accumulatedContent = ''
+        const accumulatedToolCalls: Array<{
+          id: string
+          name: string
+          args: Record<string, unknown>
+          state: string
+          result?: unknown
+        }> = []

-              // Send error as content so it shows in the chat
-              controller.enqueue(
-                encoder.encode(
-                  `data: ${JSON.stringify({ type: 'content', data: `\n\n_${errorMessage}_` })}\n\n`
-                )
-              )
-              // Send done event to properly close the stream on client
-              controller.enqueue(encoder.encode(`data: ${JSON.stringify({ type: 'done' })}\n\n`))
-            } catch (enqueueError) {
-              // Stream might already be closed, that's ok
-              logger.warn(
-                `[${tracker.requestId}] Could not send error event to client:`,
-                enqueueError
-              )
-            }
-          } finally {
-            try {
-              controller.close()
-            } catch {
-              // Controller might already be closed
-            }
+        try {
+          // Use the stream transformer to process the Sim Agent stream
+          await transformStream(simAgentResponse.body!, {
+            streamId,
+            chatId: capturedChatId,
+            userId: authenticatedUserId,
+            workflowId,
+            userMessageId: userMessageIdToUse,
+            assistantMessageId,
+
+            // Emit render events to Redis for client consumption
+            onRenderEvent: async (event: RenderEvent) => {
+              // Serialize and append to Redis
+              const serialized = serializeRenderEvent(event)
+              await appendChunk(streamId, serialized).catch(() => {})
+
+              // Also update stream metadata for specific events
+              switch (event.type) {
+                case 'text_delta':
+                  accumulatedContent += (event as any).content || ''
+                  appendContent(streamId, (event as any).content || '').catch(() => {})
+                  break
+                case 'tool_pending':
+                  updateToolCall(streamId, (event as any).toolCallId, {
+                    id: (event as any).toolCallId,
+                    name: (event as any).toolName,
+                    args: (event as any).args || {},
+                    state: 'pending',
+                  }).catch(() => {})
+                  break
+                case 'tool_executing':
+                  updateToolCall(streamId, (event as any).toolCallId, {
+                    state: 'executing',
+                  }).catch(() => {})
+                  break
+                case 'tool_success':
+                  updateToolCall(streamId, (event as any).toolCallId, {
+                    state: 'success',
+                    result: (event as any).result,
+                  }).catch(() => {})
+                  accumulatedToolCalls.push({
+                    id: (event as any).toolCallId,
+                    name: (event as any).display?.label || '',
+                    args: {},
+                    state: 'success',
+                    result: (event as any).result,
+                  })
+                  break
+                case 'tool_error':
+                  updateToolCall(streamId, (event as any).toolCallId, {
+                    state: 'error',
+                    error: (event as any).error,
+                  }).catch(() => {})
+                  accumulatedToolCalls.push({
+                    id: (event as any).toolCallId,
+                    name: (event as any).display?.label || '',
+                    args: {},
+                    state: 'error',
+                  })
+                  break
+              }
+            },
+
+            // Persist data at key moments
+            onPersist: async (data) => {
+              if (data.type === 'message_complete') {
+                // Stream complete - save final message to DB
+                await completeStream(streamId, undefined)
+              }
+            },
+
+            // Check for user-initiated abort
+            isAborted: () => {
+              // We'll check Redis for abort signal synchronously cached
+              // For now, return false - proper abort checking can be async in transformer
+              return false
+            },
+          })
+
+          // Update chat with conversationId if available
+          if (capturedCurrentChat) {
+            await db
+              .update(copilotChats)
+              .set({ updatedAt: new Date() })
+              .where(eq(copilotChats.id, capturedChatId))
          }
-        },
+
+          logger.info(`[${tracker.requestId}] Background stream processing complete`, {
+            streamId,
+            contentLength: accumulatedContent.length,
+            toolCallsCount: accumulatedToolCalls.length,
+          })
+        } catch (error) {
+          logger.error(`[${tracker.requestId}] Background stream error`, { streamId, error })
+          await errorStream(streamId, error instanceof Error ? error.message : 'Unknown error')
+        }
+      })()
+
+      // Use after() to ensure background task completes even after response is sent
+      after(() => backgroundTask)
+
+      // Return streamId immediately - client will connect to stream endpoint
+      logger.info(`[${tracker.requestId}] Returning streamId for client to connect`, {
+        streamId,
+        chatId: capturedChatId,
      })

-      const response = new Response(transformedStream, {
-        headers: {
-          'Content-Type': 'text/event-stream',
-          'Cache-Control': 'no-cache',
-          Connection: 'keep-alive',
-          'X-Accel-Buffering': 'no',
-        },
+      return NextResponse.json({
+        success: true,
+        streamId,
+        chatId: capturedChatId,
      })
-
-      logger.info(`[${tracker.requestId}] Returning streaming response to client`, {
-        duration: tracker.getDuration(),
-        chatId: actualChatId,
-        headers: {
-          'Content-Type': 'text/event-stream',
-          'Cache-Control': 'no-cache',
-          Connection: 'keep-alive',
-        },
-      })
-
-      return response
    }

    // For non-streaming responses
@@ -899,7 +735,7 @@ export async function POST(req: NextRequest) {
    // Save messages if we have a chat
    if (currentChat && responseData.content) {
      const userMessage = {
-        id: userMessageIdToUse, // Consistent ID used for request and persistence
+        id: userMessageIdToUse,
        role: 'user',
        content: message,
        timestamp: new Date().toISOString(),
--- 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)
+    const result = await executeTool(resolvedToolName, executionParams, true)

    logger.info(`[${tracker.requestId}] Tool execution complete`, {
      toolName,
--- a/apps/sim/app/api/copilot/stream/[streamId]/abort/route.ts
+++ b/apps/sim/app/api/copilot/stream/[streamId]/abort/route.ts
@@ -0,0 +1,64 @@
+/**
+ * POST /api/copilot/stream/[streamId]/abort
+ *
+ * Signal the server to abort an active stream.
+ * The original request handler will check for this signal and cancel the stream.
+ */
+
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { getSession } from '@/lib/auth'
+import { getStreamMeta, setAbortSignal } from '@/lib/copilot/stream-persistence'
+
+const logger = createLogger('CopilotStreamAbortAPI')
+
+export async function POST(
+  req: NextRequest,
+  { params }: { params: Promise<{ streamId: string }> }
+) {
+  const session = await getSession()
+  if (!session?.user?.id) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const { streamId } = await params
+
+  logger.info('Stream abort request', { streamId, userId: session.user.id })
+
+  const meta = await getStreamMeta(streamId)
+
+  if (!meta) {
+    logger.info('Stream not found for abort', { streamId })
+    return NextResponse.json({ error: 'Stream not found' }, { status: 404 })
+  }
+
+  // Verify ownership
+  if (meta.userId !== session.user.id) {
+    logger.warn('Unauthorized abort attempt', {
+      streamId,
+      requesterId: session.user.id,
+      ownerId: meta.userId,
+    })
+    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+  }
+
+  // Stream already finished
+  if (meta.status !== 'streaming') {
+    logger.info('Stream already finished, nothing to abort', {
+      streamId,
+      status: meta.status,
+    })
+    return NextResponse.json({
+      success: true,
+      message: 'Stream already finished',
+    })
+  }
+
+  // Set abort signal in Redis
+  await setAbortSignal(streamId)
+
+  logger.info('Abort signal set for stream', { streamId })
+
+  return NextResponse.json({ success: true })
+}
+
--- a/apps/sim/app/api/copilot/stream/[streamId]/pending-diff/route.ts
+++ b/apps/sim/app/api/copilot/stream/[streamId]/pending-diff/route.ts
@@ -0,0 +1,146 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { getSession } from '@/lib/auth'
+import {
+  clearPendingDiff,
+  getPendingDiff,
+  getStreamMeta,
+  setPendingDiff,
+} from '@/lib/copilot/stream-persistence'
+
+const logger = createLogger('CopilotPendingDiffAPI')
+
+/**
+ * GET /api/copilot/stream/[streamId]/pending-diff
+ * Retrieve pending diff state for a stream (used for resumption after page refresh)
+ */
+export async function GET(
+  request: Request,
+  { params }: { params: Promise<{ streamId: string }> }
+) {
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const { streamId } = await params
+    if (!streamId) {
+      return NextResponse.json({ error: 'Stream ID required' }, { status: 400 })
+    }
+
+    // Verify user owns this stream
+    const meta = await getStreamMeta(streamId)
+    if (!meta) {
+      return NextResponse.json({ error: 'Stream not found' }, { status: 404 })
+    }
+
+    if (meta.userId !== session.user.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 403 })
+    }
+
+    // Get pending diff
+    const pendingDiff = await getPendingDiff(streamId)
+
+    if (!pendingDiff) {
+      return NextResponse.json({ pendingDiff: null })
+    }
+
+    logger.info('Retrieved pending diff', {
+      streamId,
+      toolCallId: pendingDiff.toolCallId,
+    })
+
+    return NextResponse.json({ pendingDiff })
+  } catch (error) {
+    logger.error('Failed to get pending diff', { error })
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
+
+/**
+ * POST /api/copilot/stream/[streamId]/pending-diff
+ * Store pending diff state for a stream
+ */
+export async function POST(
+  request: Request,
+  { params }: { params: Promise<{ streamId: string }> }
+) {
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const { streamId } = await params
+    if (!streamId) {
+      return NextResponse.json({ error: 'Stream ID required' }, { status: 400 })
+    }
+
+    // Verify user owns this stream
+    const meta = await getStreamMeta(streamId)
+    if (!meta) {
+      return NextResponse.json({ error: 'Stream not found' }, { status: 404 })
+    }
+
+    if (meta.userId !== session.user.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 403 })
+    }
+
+    const body = await request.json()
+    const { pendingDiff } = body
+
+    if (!pendingDiff || !pendingDiff.toolCallId) {
+      return NextResponse.json({ error: 'Invalid pending diff data' }, { status: 400 })
+    }
+
+    await setPendingDiff(streamId, pendingDiff)
+
+    logger.info('Stored pending diff', {
+      streamId,
+      toolCallId: pendingDiff.toolCallId,
+    })
+
+    return NextResponse.json({ success: true })
+  } catch (error) {
+    logger.error('Failed to store pending diff', { error })
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
+
+/**
+ * DELETE /api/copilot/stream/[streamId]/pending-diff
+ * Clear pending diff state for a stream
+ */
+export async function DELETE(
+  request: Request,
+  { params }: { params: Promise<{ streamId: string }> }
+) {
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const { streamId } = await params
+    if (!streamId) {
+      return NextResponse.json({ error: 'Stream ID required' }, { status: 400 })
+    }
+
+    // Verify user owns this stream (if it exists - might already be cleaned up)
+    const meta = await getStreamMeta(streamId)
+    if (meta && meta.userId !== session.user.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 403 })
+    }
+
+    await clearPendingDiff(streamId)
+
+    logger.info('Cleared pending diff', { streamId })
+
+    return NextResponse.json({ success: true })
+  } catch (error) {
+    logger.error('Failed to clear pending diff', { error })
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
+
--- a/apps/sim/app/api/copilot/stream/[streamId]/route.ts
+++ b/apps/sim/app/api/copilot/stream/[streamId]/route.ts
@@ -0,0 +1,160 @@
+/**
+ * GET /api/copilot/stream/[streamId]
+ *
+ * Resume an active copilot stream.
+ * - If stream is still active: returns SSE with replay of missed chunks + live updates via Redis Pub/Sub
+ * - If stream is completed: returns JSON indicating to load from database
+ * - If stream not found: returns 404
+ */
+
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { getSession } from '@/lib/auth'
+import {
+  getChunks,
+  getStreamMeta,
+  subscribeToStream,
+} from '@/lib/copilot/stream-persistence'
+
+const logger = createLogger('CopilotStreamResumeAPI')
+
+const SSE_HEADERS = {
+  'Content-Type': 'text/event-stream',
+  'Cache-Control': 'no-cache',
+  Connection: 'keep-alive',
+  'X-Accel-Buffering': 'no',
+}
+
+export async function GET(
+  req: NextRequest,
+  { params }: { params: Promise<{ streamId: string }> }
+) {
+  const session = await getSession()
+  if (!session?.user?.id) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const { streamId } = await params
+  const fromChunk = parseInt(req.nextUrl.searchParams.get('from') || '0')
+
+  logger.info('Stream resume request', { streamId, fromChunk, userId: session.user.id })
+
+  const meta = await getStreamMeta(streamId)
+
+  if (!meta) {
+    logger.info('Stream not found or expired', { streamId })
+    return NextResponse.json(
+      {
+        status: 'not_found',
+        message: 'Stream not found or expired. Reload chat from database.',
+      },
+      { status: 404 }
+    )
+  }
+
+  // Verify ownership
+  if (meta.userId !== session.user.id) {
+    logger.warn('Unauthorized stream access attempt', {
+      streamId,
+      requesterId: session.user.id,
+      ownerId: meta.userId,
+    })
+    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+  }
+
+  // Stream completed - tell client to load from database
+  if (meta.status === 'completed') {
+    logger.info('Stream already completed', { streamId, chatId: meta.chatId })
+    return NextResponse.json({
+      status: 'completed',
+      chatId: meta.chatId,
+      message: 'Stream completed. Messages saved to database.',
+    })
+  }
+
+  // Stream errored
+  if (meta.status === 'error') {
+    logger.info('Stream encountered error', { streamId, chatId: meta.chatId })
+    return NextResponse.json({
+      status: 'error',
+      chatId: meta.chatId,
+      message: 'Stream encountered an error.',
+    })
+  }
+
+  // Stream still active - return SSE with replay + live updates
+  logger.info('Resuming active stream', { streamId, chatId: meta.chatId })
+
+  const encoder = new TextEncoder()
+  const abortController = new AbortController()
+
+  // Handle client disconnect
+  req.signal.addEventListener('abort', () => {
+    logger.info('Client disconnected from resumed stream', { streamId })
+    abortController.abort()
+  })
+
+  const responseStream = new ReadableStream({
+    async start(controller) {
+      try {
+        // 1. Replay missed chunks (single read from Redis LIST)
+        const missedChunks = await getChunks(streamId, fromChunk)
+        logger.info('Replaying missed chunks', {
+          streamId,
+          fromChunk,
+          missedChunkCount: missedChunks.length,
+        })
+
+        for (const chunk of missedChunks) {
+          // Chunks are already in SSE format, just re-encode
+          controller.enqueue(encoder.encode(chunk))
+        }
+
+        // 2. Subscribe to live chunks via Redis Pub/Sub (blocking, no polling)
+        await subscribeToStream(
+          streamId,
+          (chunk) => {
+            try {
+              controller.enqueue(encoder.encode(chunk))
+            } catch {
+              // Client disconnected
+              abortController.abort()
+            }
+          },
+          () => {
+            // Stream complete - close connection
+            logger.info('Stream completed during resume', { streamId })
+            try {
+              controller.close()
+            } catch {
+              // Already closed
+            }
+          },
+          abortController.signal
+        )
+      } catch (error) {
+        logger.error('Error in stream resume', {
+          streamId,
+          error: error instanceof Error ? error.message : String(error),
+        })
+        try {
+          controller.close()
+        } catch {
+          // Already closed
+        }
+      }
+    },
+    cancel() {
+      abortController.abort()
+    },
+  })
+
+  return new Response(responseStream, {
+    headers: {
+      ...SSE_HEADERS,
+      'X-Stream-Id': streamId,
+      'X-Chat-Id': meta.chatId,
+    },
+  })
+}
+
--- a/apps/sim/app/api/files/parse/route.ts
+++ b/apps/sim/app/api/files/parse/route.ts
@@ -6,10 +6,9 @@ import { createLogger } from '@sim/logger'
 import binaryExtensionsList from 'binary-extensions'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { secureFetchWithPinnedIP, validateUrlWithDNS } from '@/lib/core/security/input-validation'
+import { createPinnedUrl, 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 {
@@ -22,7 +21,6 @@ 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'
@@ -32,12 +30,6 @@ 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
@@ -45,7 +37,6 @@ 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
@@ -79,45 +70,27 @@ export async function POST(request: NextRequest) {

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

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

-    // 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,
-    })
+    logger.info('File parse request received:', { filePath, fileType, workspaceId, userId })

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

-        const result = await parseFileSingle(
-          singlePath,
-          fileType,
-          workspaceId,
-          userId,
-          executionContext
-        )
+        const result = await parseFileSingle(path, fileType, workspaceId, userId)
        if (result.metadata) {
          result.metadata.processingTime = Date.now() - startTime
        }
@@ -133,7 +106,6 @@ 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,
@@ -149,7 +121,7 @@ export async function POST(request: NextRequest) {
      })
    }

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

    if (result.metadata) {
      result.metadata.processingTime = Date.now() - startTime
@@ -165,7 +137,6 @@ 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,
@@ -193,8 +164,7 @@ async function parseFileSingle(
  filePath: string,
  fileType: string,
  workspaceId: string,
-  userId: string,
-  executionContext?: ExecutionContext
+  userId: string
 ): Promise<ParseResult> {
  logger.info('Parsing file:', filePath)

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

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

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

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

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

 /**
@@ -260,14 +230,12 @@ 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,
-  executionContext?: ExecutionContext
+  userId: string
 ): Promise<ParseResult> {
  try {
    logger.info('Fetching external URL:', url)
@@ -344,13 +312,17 @@ async function handleExternalUrl(

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

-    const response = await secureFetchWithPinnedIP(url, urlValidation.resolvedIP!, {
-      timeout: DOWNLOAD_TIMEOUT_MS,
+    const pinnedUrl = createPinnedUrl(url, urlValidation.resolvedIP!)
+    const response = await fetch(pinnedUrl, {
+      signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS),
+      headers: {
+        Host: urlValidation.originalHostname!,
+      },
    })
    if (!response.ok) {
      throw new Error(`Failed to fetch URL: ${response.status} ${response.statusText}`)
@@ -369,19 +341,6 @@ 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)
@@ -394,6 +353,8 @@ 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}`)
        }
@@ -402,23 +363,17 @@ async function handleExternalUrl(
      }
    }

-    let parseResult: ParseResult
    if (extension === 'pdf') {
-      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 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)
    }

-    // Attach userFile to the result
-    if (userFile) {
-      parseResult.userFile = userFile
-    }
-
-    return parseResult
+    return handleGenericBuffer(buffer, filename, extension, fileType)
  } catch (error) {
    logger.error(`Error handling external URL ${url}:`, error)
    return {
@@ -431,15 +386,12 @@ 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,
-  executionContext?: ExecutionContext
+  userId: string
 ): Promise<ParseResult> {
  try {
    const cloudKey = extractStorageKey(filePath)
@@ -486,7 +438,6 @@ 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
@@ -502,39 +453,6 @@ 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)
@@ -559,11 +477,6 @@ 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)
@@ -587,8 +500,7 @@ async function handleCloudFile(
 async function handleLocalFile(
  filePath: string,
  fileType: string,
-  userId: string,
-  executionContext?: ExecutionContext
+  userId: string
 ): Promise<ParseResult> {
  try {
    const filename = filePath.split('/').pop() || filePath
@@ -628,32 +540,13 @@ 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: mimeType,
+        fileType: fileType || getMimeTypeFromExtension(extension),
        size: stats.size,
        hash,
        processingTime: 0,
--- a/apps/sim/app/api/form/[identifier]/route.ts
+++ b/apps/sim/app/api/form/[identifier]/route.ts
@@ -11,7 +11,7 @@ import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
 import { createStreamingResponse } from '@/lib/workflows/streaming/streaming'
-import { isInputDefinitionTrigger } from '@/lib/workflows/triggers/input-definition-triggers'
+import { isValidStartBlockType } from '@/lib/workflows/triggers/start-block-types'
 import { setFormAuthCookie, validateFormAuth } from '@/app/api/form/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'

@@ -36,7 +36,7 @@ async function getWorkflowInputSchema(workflowId: string): Promise<any[]> {
      .from(workflowBlocks)
      .where(eq(workflowBlocks.workflowId, workflowId))

-    const startBlock = blocks.find((block) => isInputDefinitionTrigger(block.type))
+    const startBlock = blocks.find((block) => isValidStartBlockType(block.type))

    if (!startBlock) {
      return []
--- a/apps/sim/app/api/function/execute/route.test.ts
+++ b/apps/sim/app/api/function/execute/route.test.ts
@@ -276,11 +276,8 @@ describe('Function Execute API Route', () => {
    it.concurrent('should resolve tag variables with <tag_name> syntax', async () => {
      const req = createMockRequest('POST', {
        code: 'return <email>',
-        blockData: {
-          'block-123': { id: '123', subject: 'Test Email' },
-        },
-        blockNameMapping: {
-          email: 'block-123',
+        params: {
+          email: { id: '123', subject: 'Test Email' },
        },
      })

@@ -308,13 +305,9 @@ describe('Function Execute API Route', () => {
    it.concurrent('should only match valid variable names in angle brackets', async () => {
      const req = createMockRequest('POST', {
        code: 'return <validVar> + "<invalid@email.com>" + <another_valid>',
-        blockData: {
-          'block-1': 'hello',
-          'block-2': 'world',
-        },
-        blockNameMapping: {
-          validVar: 'block-1',
-          another_valid: 'block-2',
+        params: {
+          validVar: 'hello',
+          another_valid: 'world',
        },
      })

@@ -328,22 +321,28 @@ describe('Function Execute API Route', () => {
    it.concurrent(
      'should handle Gmail webhook data with email addresses containing angle brackets',
      async () => {
-        const emailData = {
-          id: '123',
-          from: 'Waleed Latif <waleed@sim.ai>',
-          to: 'User <user@example.com>',
-          subject: 'Test Email',
-          bodyText: 'Hello world',
+        const gmailData = {
+          email: {
+            id: '123',
+            from: 'Waleed Latif <waleed@sim.ai>',
+            to: 'User <user@example.com>',
+            subject: 'Test Email',
+            bodyText: 'Hello world',
+          },
+          rawEmail: {
+            id: '123',
+            payload: {
+              headers: [
+                { name: 'From', value: 'Waleed Latif <waleed@sim.ai>' },
+                { name: 'To', value: 'User <user@example.com>' },
+              ],
+            },
+          },
        }

        const req = createMockRequest('POST', {
          code: 'return <email>',
-          blockData: {
-            'block-email': emailData,
-          },
-          blockNameMapping: {
-            email: 'block-email',
-          },
+          params: gmailData,
        })

        const response = await POST(req)
@@ -357,20 +356,17 @@ describe('Function Execute API Route', () => {
    it.concurrent(
      'should properly serialize complex email objects with special characters',
      async () => {
-        const emailData = {
-          from: 'Test User <test@example.com>',
-          bodyHtml: '<div>HTML content with "quotes" and \'apostrophes\'</div>',
-          bodyText: 'Text with\nnewlines\tand\ttabs',
+        const complexEmailData = {
+          email: {
+            from: 'Test User <test@example.com>',
+            bodyHtml: '<div>HTML content with "quotes" and \'apostrophes\'</div>',
+            bodyText: 'Text with\nnewlines\tand\ttabs',
+          },
        }

        const req = createMockRequest('POST', {
          code: 'return <email>',
-          blockData: {
-            'block-email': emailData,
-          },
-          blockNameMapping: {
-            email: 'block-email',
-          },
+          params: complexEmailData,
        })

        const response = await POST(req)
@@ -523,23 +519,18 @@ describe('Function Execute API Route', () => {
    })

    it.concurrent('should handle JSON serialization edge cases', async () => {
-      const complexData = {
-        special: 'chars"with\'quotes',
-        unicode: '🎉 Unicode content',
-        nested: {
-          deep: {
-            value: 'test',
-          },
-        },
-      }
-
      const req = createMockRequest('POST', {
        code: 'return <complexData>',
-        blockData: {
-          'block-complex': complexData,
-        },
-        blockNameMapping: {
-          complexData: 'block-complex',
+        params: {
+          complexData: {
+            special: 'chars"with\'quotes',
+            unicode: '🎉 Unicode content',
+            nested: {
+              deep: {
+                value: 'test',
+              },
+            },
+          },
        },
      })

--- a/apps/sim/app/api/function/execute/route.ts
+++ b/apps/sim/app/api/function/execute/route.ts
@@ -9,8 +9,8 @@ import { escapeRegExp, normalizeName, REFERENCE } from '@/executor/constants'
 import {
  createEnvVarPattern,
  createWorkflowVariablePattern,
+  resolveEnvVarReferences,
 } from '@/executor/utils/reference-validation'
-import { navigatePath } from '@/executor/variables/resolvers/reference'
 export const dynamic = 'force-dynamic'
 export const runtime = 'nodejs'

@@ -18,8 +18,8 @@ export const MAX_DURATION = 210

 const logger = createLogger('FunctionExecuteAPI')

-const E2B_JS_WRAPPER_LINES = 3
-const E2B_PYTHON_WRAPPER_LINES = 1
+const E2B_JS_WRAPPER_LINES = 3 // Lines before user code: ';(async () => {', '  try {', '    const __sim_result = await (async () => {'
+const E2B_PYTHON_WRAPPER_LINES = 1 // Lines before user code: 'def __sim_main__():'

 type TypeScriptModule = typeof import('typescript')

@@ -134,21 +134,33 @@ function extractEnhancedError(
  if (error.stack) {
    enhanced.stack = error.stack

+    // Parse stack trace to extract line and column information
+    // Handle both compilation errors and runtime errors
    const stackLines: string[] = error.stack.split('\n')

    for (const line of stackLines) {
+      // Pattern 1: Compilation errors - "user-function.js:6"
      let match = line.match(/user-function\.js:(\d+)(?::(\d+))?/)

+      // Pattern 2: Runtime errors - "at user-function.js:5:12"
      if (!match) {
        match = line.match(/at\s+user-function\.js:(\d+):(\d+)/)
      }

+      // Pattern 3: Generic patterns for any line containing our filename
+      if (!match) {
+        match = line.match(/user-function\.js:(\d+)(?::(\d+))?/)
+      }
+
      if (match) {
        const stackLine = Number.parseInt(match[1], 10)
        const stackColumn = match[2] ? Number.parseInt(match[2], 10) : undefined

+        // Adjust line number to account for wrapper code
+        // The user code starts at a specific line in our wrapper
        const adjustedLine = stackLine - userCodeStartLine + 1

+        // Check if this is a syntax error in wrapper code caused by incomplete user code
        const isWrapperSyntaxError =
          stackLine > userCodeStartLine &&
          error.name === 'SyntaxError' &&
@@ -156,6 +168,7 @@ function extractEnhancedError(
            error.message.includes('Unexpected end of input'))

        if (isWrapperSyntaxError && userCode) {
+          // Map wrapper syntax errors to the last line of user code
          const codeLines = userCode.split('\n')
          const lastUserLine = codeLines.length
          enhanced.line = lastUserLine
@@ -168,6 +181,7 @@ function extractEnhancedError(
          enhanced.line = adjustedLine
          enhanced.column = stackColumn

+          // Extract the actual line content from user code
          if (userCode) {
            const codeLines = userCode.split('\n')
            if (adjustedLine <= codeLines.length) {
@@ -178,6 +192,7 @@ function extractEnhancedError(
        }

        if (stackLine <= userCodeStartLine) {
+          // Error is in wrapper code itself
          enhanced.line = stackLine
          enhanced.column = stackColumn
          break
@@ -185,6 +200,7 @@ function extractEnhancedError(
      }
    }

+    // Clean up stack trace to show user-relevant information
    const cleanedStackLines: string[] = stackLines
      .filter(
        (line: string) =>
@@ -198,6 +214,9 @@ function extractEnhancedError(
    }
  }

+  // Keep original message without adding error type prefix
+  // The error type will be added later in createUserFriendlyErrorMessage
+
  return enhanced
 }

@@ -212,6 +231,7 @@ function formatE2BError(
  userCode: string,
  prologueLineCount: number
 ): { formattedError: string; cleanedOutput: string } {
+  // Calculate line offset based on language and prologue
  const wrapperLines =
    language === CodeLanguage.Python ? E2B_PYTHON_WRAPPER_LINES : E2B_JS_WRAPPER_LINES
  const totalOffset = prologueLineCount + wrapperLines
@@ -221,20 +241,27 @@ function formatE2BError(
  let cleanErrorMsg = ''

  if (language === CodeLanguage.Python) {
+    // Python error format: "Cell In[X], line Y" followed by error details
+    // Extract line number from the Cell reference
    const cellMatch = errorOutput.match(/Cell In\[\d+\], line (\d+)/)
    if (cellMatch) {
      const originalLine = Number.parseInt(cellMatch[1], 10)
      userLine = originalLine - totalOffset
    }

+    // Extract clean error message from the error string
+    // Remove file references like "(detected at line X) (file.py, line Y)"
    cleanErrorMsg = errorMessage
      .replace(/\s*\(detected at line \d+\)/g, '')
      .replace(/\s*\([^)]+\.py, line \d+\)/g, '')
      .trim()
  } else if (language === CodeLanguage.JavaScript) {
+    // JavaScript error format from E2B: "SyntaxError: /path/file.ts: Message. (line:col)\n\n   9 | ..."
+    // First, extract the error type and message from the first line
    const firstLineEnd = errorMessage.indexOf('\n')
    const firstLine = firstLineEnd > 0 ? errorMessage.substring(0, firstLineEnd) : errorMessage

+    // Parse: "SyntaxError: /home/user/index.ts: Missing semicolon. (11:9)"
    const jsErrorMatch = firstLine.match(/^(\w+Error):\s*[^:]+:\s*([^(]+)\.\s*\((\d+):(\d+)\)/)
    if (jsErrorMatch) {
      cleanErrorType = jsErrorMatch[1]
@@ -242,11 +269,13 @@ function formatE2BError(
      const originalLine = Number.parseInt(jsErrorMatch[3], 10)
      userLine = originalLine - totalOffset
    } else {
+      // Fallback: look for line number in the arrow pointer line (> 11 |)
      const arrowMatch = errorMessage.match(/^>\s*(\d+)\s*\|/m)
      if (arrowMatch) {
        const originalLine = Number.parseInt(arrowMatch[1], 10)
        userLine = originalLine - totalOffset
      }
+      // Try to extract error type and message
      const errorMatch = firstLine.match(/^(\w+Error):\s*(.+)/)
      if (errorMatch) {
        cleanErrorType = errorMatch[1]
@@ -260,11 +289,13 @@ function formatE2BError(
    }
  }

+  // Build the final clean error message
  const finalErrorMsg =
    cleanErrorType && cleanErrorMsg
      ? `${cleanErrorType}: ${cleanErrorMsg}`
      : cleanErrorMsg || errorMessage

+  // Format with line number if available
  let formattedError = finalErrorMsg
  if (userLine && userLine > 0) {
    const codeLines = userCode.split('\n')
@@ -280,6 +311,7 @@ function formatE2BError(
    }
  }

+  // For stdout, just return the clean error message without the full traceback
  const cleanedOutput = finalErrorMsg

  return { formattedError, cleanedOutput }
@@ -295,6 +327,7 @@ function createUserFriendlyErrorMessage(
 ): string {
  let errorMessage = enhanced.message

+  // Add line information if available
  if (enhanced.line !== undefined) {
    let lineInfo = `Line ${enhanced.line}`

@@ -305,14 +338,18 @@ function createUserFriendlyErrorMessage(

    errorMessage = `${lineInfo} - ${errorMessage}`
  } else {
+    // If no line number, try to extract it from stack trace for display
    if (enhanced.stack) {
      const stackMatch = enhanced.stack.match(/user-function\.js:(\d+)(?::(\d+))?/)
      if (stackMatch) {
        const line = Number.parseInt(stackMatch[1], 10)
        let lineInfo = `Line ${line}`

+        // Try to get line content if we have userCode
        if (userCode) {
          const codeLines = userCode.split('\n')
+          // Note: stackMatch gives us VM line number, need to adjust
+          // This is a fallback case, so we might not have perfect line mapping
          if (line <= codeLines.length) {
            const lineContent = codeLines[line - 1]?.trim()
            if (lineContent) {
@@ -326,6 +363,7 @@ function createUserFriendlyErrorMessage(
    }
  }

+  // Add error type prefix with consistent naming
  if (enhanced.name !== 'Error') {
    const errorTypePrefix =
      enhanced.name === 'SyntaxError'
@@ -336,6 +374,7 @@ function createUserFriendlyErrorMessage(
            ? 'Reference Error'
            : enhanced.name

+    // Only add prefix if not already present
    if (!errorMessage.toLowerCase().includes(errorTypePrefix.toLowerCase())) {
      errorMessage = `${errorTypePrefix}: ${errorMessage}`
    }
@@ -344,6 +383,9 @@ function createUserFriendlyErrorMessage(
  return errorMessage
 }

+/**
+ * Resolves workflow variables with <variable.name> syntax
+ */
 function resolveWorkflowVariables(
  code: string,
  workflowVariables: Record<string, any>,
@@ -363,35 +405,39 @@ function resolveWorkflowVariables(
  while ((match = regex.exec(code)) !== null) {
    const variableName = match[1].trim()

+    // Find the variable by name (workflowVariables is indexed by ID, values are variable objects)
    const foundVariable = Object.entries(workflowVariables).find(
      ([_, variable]) => normalizeName(variable.name || '') === variableName
    )

-    if (!foundVariable) {
-      const availableVars = Object.values(workflowVariables)
-        .map((v) => v.name)
-        .filter(Boolean)
-      throw new Error(
-        `Variable "${variableName}" doesn't exist.` +
-          (availableVars.length > 0 ? ` Available: ${availableVars.join(', ')}` : '')
-      )
-    }
+    let variableValue: unknown = ''
+    if (foundVariable) {
+      const variable = foundVariable[1]
+      variableValue = variable.value

-    const variable = foundVariable[1]
-    let variableValue: unknown = variable.value
-
-    if (variable.value !== undefined && variable.value !== null) {
-      const type = variable.type === 'string' ? 'plain' : variable.type
-
-      if (type === 'number') {
-        variableValue = Number(variableValue)
-      } else if (type === 'boolean') {
-        variableValue = variableValue === 'true' || variableValue === true
-      } else if (type === 'json' && typeof variableValue === 'string') {
+      if (variable.value !== undefined && variable.value !== null) {
        try {
-          variableValue = JSON.parse(variableValue)
+          // Handle 'string' type the same as 'plain' for backward compatibility
+          const type = variable.type === 'string' ? 'plain' : variable.type
+
+          // For plain text, use exactly what's entered without modifications
+          if (type === 'plain' && typeof variableValue === 'string') {
+            // Use as-is for plain text
+          } else if (type === 'number') {
+            variableValue = Number(variableValue)
+          } else if (type === 'boolean') {
+            variableValue = variableValue === 'true' || variableValue === true
+          } else if (type === 'json') {
+            try {
+              variableValue =
+                typeof variableValue === 'string' ? JSON.parse(variableValue) : variableValue
+            } catch {
+              // Keep original value if JSON parsing fails
+            }
+          }
        } catch {
-          // Keep as-is
+          // Fallback to original value on error
+          variableValue = variable.value
        }
      }
    }
@@ -404,9 +450,11 @@ function resolveWorkflowVariables(
    })
  }

+  // Process replacements in reverse order to maintain correct indices
  for (let i = replacements.length - 1; i >= 0; i--) {
    const { match: matchStr, index, variableName, variableValue } = replacements[i]

+    // Use variable reference approach
    const safeVarName = `__variable_${variableName.replace(/[^a-zA-Z0-9_]/g, '_')}`
    contextVariables[safeVarName] = variableValue
    resolvedCode =
@@ -416,6 +464,9 @@ function resolveWorkflowVariables(
  return resolvedCode
 }

+/**
+ * Resolves environment variables with {{var_name}} syntax
+ */
 function resolveEnvironmentVariables(
  code: string,
  params: Record<string, any>,
@@ -431,28 +482,32 @@ function resolveEnvironmentVariables(

  const resolverVars: Record<string, string> = {}
  Object.entries(params).forEach(([key, value]) => {
-    if (value !== undefined && value !== null) {
+    if (value) {
      resolverVars[key] = String(value)
    }
  })
  Object.entries(envVars).forEach(([key, value]) => {
-    if (value !== undefined && value !== null) {
+    if (value) {
      resolverVars[key] = value
    }
  })

  while ((match = regex.exec(code)) !== null) {
    const varName = match[1].trim()
-
-    if (!(varName in resolverVars)) {
-      continue
-    }
-
+    const resolved = resolveEnvVarReferences(match[0], resolverVars, {
+      allowEmbedded: true,
+      resolveExactMatch: true,
+      trimKeys: true,
+      onMissing: 'empty',
+      deep: false,
+    })
+    const varValue =
+      typeof resolved === 'string' ? resolved : resolved == null ? '' : String(resolved)
    replacements.push({
      match: match[0],
      index: match.index,
      varName,
-      varValue: resolverVars[varName],
+      varValue: String(varValue),
    })
  }

@@ -468,8 +523,12 @@ function resolveEnvironmentVariables(
  return resolvedCode
 }

+/**
+ * Resolves tags with <tag_name> syntax (including nested paths like <block.response.data>)
+ */
 function resolveTagVariables(
  code: string,
+  params: Record<string, any>,
  blockData: Record<string, any>,
  blockNameMapping: Record<string, string>,
  contextVariables: Record<string, any>
@@ -484,30 +543,27 @@ function resolveTagVariables(

  for (const match of tagMatches) {
    const tagName = match.slice(REFERENCE.START.length, -REFERENCE.END.length).trim()
-    const pathParts = tagName.split(REFERENCE.PATH_DELIMITER)
-    const blockName = pathParts[0]

-    const blockId = blockNameMapping[blockName]
-    if (!blockId) {
-      continue
-    }
-
-    const blockOutput = blockData[blockId]
-    if (blockOutput === undefined) {
-      continue
-    }
-
-    let tagValue: any
-    if (pathParts.length === 1) {
-      tagValue = blockOutput
-    } else {
-      tagValue = navigatePath(blockOutput, pathParts.slice(1))
-    }
-
-    if (tagValue === undefined) {
-      continue
+    // Handle nested paths like "getrecord.response.data" or "function1.response.result"
+    // First try params, then blockData directly, then try with block name mapping
+    let tagValue = getNestedValue(params, tagName) || getNestedValue(blockData, tagName) || ''
+
+    // If not found and the path starts with a block name, try mapping the block name to ID
+    if (!tagValue && tagName.includes(REFERENCE.PATH_DELIMITER)) {
+      const pathParts = tagName.split(REFERENCE.PATH_DELIMITER)
+      const normalizedBlockName = pathParts[0] // This should already be normalized like "function1"
+
+      // Direct lookup using normalized block name
+      const blockId = blockNameMapping[normalizedBlockName] ?? null
+
+      if (blockId) {
+        const remainingPath = pathParts.slice(1).join('.')
+        const fullPath = `${blockId}.${remainingPath}`
+        tagValue = getNestedValue(blockData, fullPath) || ''
+      }
    }

+    // If the value is a stringified JSON, parse it back to object
    if (
      typeof tagValue === 'string' &&
      tagValue.length > 100 &&
@@ -515,13 +571,16 @@ function resolveTagVariables(
    ) {
      try {
        tagValue = JSON.parse(tagValue)
-      } catch {
-        // Keep as-is
+      } catch (e) {
+        // Keep as string if parsing fails
      }
    }

+    // Instead of injecting large JSON directly, create a variable reference
    const safeVarName = `__tag_${tagName.replace(/[^a-zA-Z0-9_]/g, '_')}`
    contextVariables[safeVarName] = tagValue
+
+    // Replace the template with a variable reference
    resolvedCode = resolvedCode.replace(new RegExp(escapeRegExp(match), 'g'), safeVarName)
  }

@@ -546,13 +605,35 @@ function resolveCodeVariables(
  let resolvedCode = code
  const contextVariables: Record<string, any> = {}

+  // Resolve workflow variables with <variable.name> syntax first
  resolvedCode = resolveWorkflowVariables(resolvedCode, workflowVariables, contextVariables)
+
+  // Resolve environment variables with {{var_name}} syntax
  resolvedCode = resolveEnvironmentVariables(resolvedCode, params, envVars, contextVariables)
-  resolvedCode = resolveTagVariables(resolvedCode, blockData, blockNameMapping, contextVariables)
+
+  // Resolve tags with <tag_name> syntax (including nested paths like <block.response.data>)
+  resolvedCode = resolveTagVariables(
+    resolvedCode,
+    params,
+    blockData,
+    blockNameMapping,
+    contextVariables
+  )

  return { resolvedCode, contextVariables }
 }

+/**
+ * Get nested value from object using dot notation path
+ */
+function getNestedValue(obj: any, path: string): any {
+  if (!obj || !path) return undefined
+
+  return path.split('.').reduce((current, key) => {
+    return current && typeof current === 'object' ? current[key] : undefined
+  }, obj)
+}
+
 /**
 * Remove one trailing newline from stdout
 * This handles the common case where print() or console.log() adds a trailing \n
@@ -590,6 +671,7 @@ export async function POST(req: NextRequest) {
      isCustomTool = false,
    } = body

+    // Extract internal parameters that shouldn't be passed to the execution context
    const executionParams = { ...params }
    executionParams._context = undefined

@@ -615,6 +697,7 @@ export async function POST(req: NextRequest) {

    const lang = isValidCodeLanguage(language) ? language : DEFAULT_CODE_LANGUAGE

+    // Extract imports once for JavaScript code (reuse later to avoid double extraction)
    let jsImports = ''
    let jsRemainingCode = resolvedCode
    let hasImports = false
@@ -624,22 +707,31 @@ export async function POST(req: NextRequest) {
      jsImports = extractionResult.imports
      jsRemainingCode = extractionResult.remainingCode

+      // Check for ES6 imports or CommonJS require statements
+      // ES6 imports are extracted by the TypeScript parser
+      // Also check for require() calls which indicate external dependencies
      const hasRequireStatements = /require\s*\(\s*['"`]/.test(resolvedCode)
      hasImports = jsImports.trim().length > 0 || hasRequireStatements
    }

+    // Python always requires E2B
    if (lang === CodeLanguage.Python && !isE2bEnabled) {
      throw new Error(
        'Python execution requires E2B to be enabled. Please contact your administrator to enable E2B, or use JavaScript instead.'
      )
    }

+    // JavaScript with imports requires E2B
    if (lang === CodeLanguage.JavaScript && hasImports && !isE2bEnabled) {
      throw new Error(
        'JavaScript code with import statements requires E2B to be enabled. Please remove the import statements, or contact your administrator to enable E2B.'
      )
    }

+    // Use E2B if:
+    // - E2B is enabled AND
+    // - Not a custom tool AND
+    // - (Python OR JavaScript with imports)
    const useE2B =
      isE2bEnabled &&
      !isCustomTool &&
@@ -652,10 +744,13 @@ export async function POST(req: NextRequest) {
        language: lang,
      })
      let prologue = ''
+      const epilogue = ''

      if (lang === CodeLanguage.JavaScript) {
+        // Track prologue lines for error adjustment
        let prologueLineCount = 0

+        // Reuse the imports we already extracted earlier
        const imports = jsImports
        const remainingCode = jsRemainingCode

@@ -687,7 +782,7 @@ export async function POST(req: NextRequest) {
          '  }',
          '})();',
        ].join('\n')
-        const codeForE2B = importSection + prologue + wrapped
+        const codeForE2B = importSection + prologue + wrapped + epilogue

        const execStart = Date.now()
        const {
@@ -709,6 +804,7 @@ export async function POST(req: NextRequest) {
          error: e2bError,
        })

+        // If there was an execution error, format it properly
        if (e2bError) {
          const { formattedError, cleanedOutput } = formatE2BError(
            e2bError,
@@ -732,7 +828,7 @@ export async function POST(req: NextRequest) {
          output: { result: e2bResult ?? null, stdout: cleanStdout(stdout), executionTime },
        })
      }
-
+      // Track prologue lines for error adjustment
      let prologueLineCount = 0
      prologue += 'import json\n'
      prologueLineCount++
@@ -750,7 +846,7 @@ export async function POST(req: NextRequest) {
        '__sim_result__ = __sim_main__()',
        "print('__SIM_RESULT__=' + json.dumps(__sim_result__))",
      ].join('\n')
-      const codeForE2B = prologue + wrapped
+      const codeForE2B = prologue + wrapped + epilogue

      const execStart = Date.now()
      const {
@@ -772,6 +868,7 @@ export async function POST(req: NextRequest) {
        error: e2bError,
      })

+      // If there was an execution error, format it properly
      if (e2bError) {
        const { formattedError, cleanedOutput } = formatE2BError(
          e2bError,
@@ -800,6 +897,7 @@ export async function POST(req: NextRequest) {

    const wrapperLines = ['(async () => {', '  try {']
    if (isCustomTool) {
+      wrapperLines.push('    // For custom tools, make parameters directly accessible')
      Object.keys(executionParams).forEach((key) => {
        wrapperLines.push(`    const ${key} = params.${key};`)
      })
@@ -833,10 +931,12 @@ export async function POST(req: NextRequest) {
      })

      const ivmError = isolatedResult.error
+      // Adjust line number for prepended param destructuring in custom tools
      let adjustedLine = ivmError.line
      let adjustedLineContent = ivmError.lineContent
      if (prependedLineCount > 0 && ivmError.line !== undefined) {
        adjustedLine = Math.max(1, ivmError.line - prependedLineCount)
+        // Get line content from original user code, not the prepended code
        const codeLines = resolvedCode.split('\n')
        if (adjustedLine <= codeLines.length) {
          adjustedLineContent = codeLines[adjustedLine - 1]?.trim()
--- a/apps/sim/app/api/proxy/image/route.ts
+++ b/apps/sim/app/api/proxy/image/route.ts
--- a/apps/sim/app/api/proxy/route.ts
+++ b/apps/sim/app/api/proxy/route.ts
@@ -0,0 +1,395 @@
+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/proxy/stt/route.ts
+++ b/apps/sim/app/api/proxy/stt/route.ts
--- a/apps/sim/app/api/proxy/tts/route.ts
+++ b/apps/sim/app/api/proxy/tts/route.ts
--- a/apps/sim/app/api/proxy/tts/unified/route.ts
+++ b/apps/sim/app/api/proxy/tts/unified/route.ts
--- a/apps/sim/app/api/proxy/video/route.ts
+++ b/apps/sim/app/api/proxy/video/route.ts
--- a/apps/sim/app/api/tools/mistral/parse/route.ts
+++ b/apps/sim/app/api/tools/mistral/parse/route.ts
@@ -5,11 +5,7 @@ import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { StorageService } from '@/lib/uploads'
-import {
-  extractStorageKey,
-  inferContextFromKey,
-  isInternalFileUrl,
-} from '@/lib/uploads/utils/file-utils'
+import { extractStorageKey, inferContextFromKey } from '@/lib/uploads/utils/file-utils'
 import { verifyFileAccess } from '@/app/api/files/authorization'

 export const dynamic = 'force-dynamic'
@@ -51,13 +47,13 @@ export async function POST(request: NextRequest) {

    logger.info(`[${requestId}] Mistral parse request`, {
      filePath: validatedData.filePath,
-      isWorkspaceFile: isInternalFileUrl(validatedData.filePath),
+      isWorkspaceFile: validatedData.filePath.includes('/api/files/serve/'),
      userId,
    })

    let fileUrl = validatedData.filePath

-    if (isInternalFileUrl(validatedData.filePath)) {
+    if (validatedData.filePath?.includes('/api/files/serve/')) {
      try {
        const storageKey = extractStorageKey(validatedData.filePath)

--- a/apps/sim/app/api/tools/pulse/parse/route.ts
+++ b/apps/sim/app/api/tools/pulse/parse/route.ts
@@ -5,11 +5,7 @@ import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { StorageService } from '@/lib/uploads'
-import {
-  extractStorageKey,
-  inferContextFromKey,
-  isInternalFileUrl,
-} from '@/lib/uploads/utils/file-utils'
+import { extractStorageKey, inferContextFromKey } from '@/lib/uploads/utils/file-utils'
 import { verifyFileAccess } from '@/app/api/files/authorization'

 export const dynamic = 'force-dynamic'
@@ -52,13 +48,13 @@ export async function POST(request: NextRequest) {

    logger.info(`[${requestId}] Pulse parse request`, {
      filePath: validatedData.filePath,
-      isWorkspaceFile: isInternalFileUrl(validatedData.filePath),
+      isWorkspaceFile: validatedData.filePath.includes('/api/files/serve/'),
      userId,
    })

    let fileUrl = validatedData.filePath

-    if (isInternalFileUrl(validatedData.filePath)) {
+    if (validatedData.filePath?.includes('/api/files/serve/')) {
      try {
        const storageKey = extractStorageKey(validatedData.filePath)
        const context = inferContextFromKey(storageKey)
--- a/apps/sim/app/api/tools/reducto/parse/route.ts
+++ b/apps/sim/app/api/tools/reducto/parse/route.ts
@@ -5,11 +5,7 @@ import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { StorageService } from '@/lib/uploads'
-import {
-  extractStorageKey,
-  inferContextFromKey,
-  isInternalFileUrl,
-} from '@/lib/uploads/utils/file-utils'
+import { extractStorageKey, inferContextFromKey } from '@/lib/uploads/utils/file-utils'
 import { verifyFileAccess } from '@/app/api/files/authorization'

 export const dynamic = 'force-dynamic'
@@ -48,13 +44,13 @@ export async function POST(request: NextRequest) {

    logger.info(`[${requestId}] Reducto parse request`, {
      filePath: validatedData.filePath,
-      isWorkspaceFile: isInternalFileUrl(validatedData.filePath),
+      isWorkspaceFile: validatedData.filePath.includes('/api/files/serve/'),
      userId,
    })

    let fileUrl = validatedData.filePath

-    if (isInternalFileUrl(validatedData.filePath)) {
+    if (validatedData.filePath?.includes('/api/files/serve/')) {
      try {
        const storageKey = extractStorageKey(validatedData.filePath)
        const context = inferContextFromKey(storageKey)
--- a/apps/sim/app/api/tools/s3/copy-object/route.ts
+++ b/apps/sim/app/api/tools/s3/copy-object/route.ts
@@ -79,13 +79,11 @@ export async function POST(request: NextRequest) {
    // Generate public URL for destination (properly encode the destination key)
    const encodedDestKey = validatedData.destinationKey.split('/').map(encodeURIComponent).join('/')
    const url = `https://${validatedData.destinationBucket}.s3.${validatedData.region}.amazonaws.com/${encodedDestKey}`
-    const uri = `s3://${validatedData.destinationBucket}/${validatedData.destinationKey}`

    return NextResponse.json({
      success: true,
      output: {
        url,
-        uri,
        copySourceVersionId: result.CopySourceVersionId,
        versionId: result.VersionId,
        etag: result.CopyObjectResult?.ETag,
--- a/apps/sim/app/api/tools/s3/put-object/route.ts
+++ b/apps/sim/app/api/tools/s3/put-object/route.ts
@@ -117,13 +117,11 @@ export async function POST(request: NextRequest) {

    const encodedKey = validatedData.objectKey.split('/').map(encodeURIComponent).join('/')
    const url = `https://${validatedData.bucketName}.s3.${validatedData.region}.amazonaws.com/${encodedKey}`
-    const uri = `s3://${validatedData.bucketName}/${validatedData.objectKey}`

    return NextResponse.json({
      success: true,
      output: {
        url,
-        uri,
        etag: result.ETag,
        location: url,
        key: validatedData.objectKey,
--- a/apps/sim/app/api/tools/textract/parse/route.ts
+++ b/apps/sim/app/api/tools/textract/parse/route.ts
@@ -1,637 +0,0 @@
-import crypto from 'crypto'
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import {
-  validateAwsRegion,
-  validateExternalUrl,
-  validateS3BucketName,
-} from '@/lib/core/security/input-validation'
-import { generateRequestId } from '@/lib/core/utils/request'
-import { StorageService } from '@/lib/uploads'
-import {
-  extractStorageKey,
-  inferContextFromKey,
-  isInternalFileUrl,
-} from '@/lib/uploads/utils/file-utils'
-import { verifyFileAccess } from '@/app/api/files/authorization'
-
-export const dynamic = 'force-dynamic'
-export const maxDuration = 300 // 5 minutes for large multi-page PDF processing
-
-const logger = createLogger('TextractParseAPI')
-
-const QuerySchema = z.object({
-  Text: z.string().min(1),
-  Alias: z.string().optional(),
-  Pages: z.array(z.string()).optional(),
-})
-
-const TextractParseSchema = z
-  .object({
-    accessKeyId: z.string().min(1, 'AWS Access Key ID is required'),
-    secretAccessKey: z.string().min(1, 'AWS Secret Access Key is required'),
-    region: z.string().min(1, 'AWS region is required'),
-    processingMode: z.enum(['sync', 'async']).optional().default('sync'),
-    filePath: z.string().optional(),
-    s3Uri: z.string().optional(),
-    featureTypes: z
-      .array(z.enum(['TABLES', 'FORMS', 'QUERIES', 'SIGNATURES', 'LAYOUT']))
-      .optional(),
-    queries: z.array(QuerySchema).optional(),
-  })
-  .superRefine((data, ctx) => {
-    const regionValidation = validateAwsRegion(data.region, 'AWS region')
-    if (!regionValidation.isValid) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: regionValidation.error,
-        path: ['region'],
-      })
-    }
-  })
-
-function getSignatureKey(
-  key: string,
-  dateStamp: string,
-  regionName: string,
-  serviceName: string
-): Buffer {
-  const kDate = crypto.createHmac('sha256', `AWS4${key}`).update(dateStamp).digest()
-  const kRegion = crypto.createHmac('sha256', kDate).update(regionName).digest()
-  const kService = crypto.createHmac('sha256', kRegion).update(serviceName).digest()
-  const kSigning = crypto.createHmac('sha256', kService).update('aws4_request').digest()
-  return kSigning
-}
-
-function signAwsRequest(
-  method: string,
-  host: string,
-  uri: string,
-  body: string,
-  accessKeyId: string,
-  secretAccessKey: string,
-  region: string,
-  service: string,
-  amzTarget: string
-): Record<string, string> {
-  const date = new Date()
-  const amzDate = date.toISOString().replace(/[:-]|\.\d{3}/g, '')
-  const dateStamp = amzDate.slice(0, 8)
-
-  const payloadHash = crypto.createHash('sha256').update(body).digest('hex')
-
-  const canonicalHeaders =
-    `content-type:application/x-amz-json-1.1\n` +
-    `host:${host}\n` +
-    `x-amz-date:${amzDate}\n` +
-    `x-amz-target:${amzTarget}\n`
-
-  const signedHeaders = 'content-type;host;x-amz-date;x-amz-target'
-
-  const canonicalRequest = `${method}\n${uri}\n\n${canonicalHeaders}\n${signedHeaders}\n${payloadHash}`
-
-  const algorithm = 'AWS4-HMAC-SHA256'
-  const credentialScope = `${dateStamp}/${region}/${service}/aws4_request`
-  const stringToSign = `${algorithm}\n${amzDate}\n${credentialScope}\n${crypto.createHash('sha256').update(canonicalRequest).digest('hex')}`
-
-  const signingKey = getSignatureKey(secretAccessKey, dateStamp, region, service)
-  const signature = crypto.createHmac('sha256', signingKey).update(stringToSign).digest('hex')
-
-  const authorizationHeader = `${algorithm} Credential=${accessKeyId}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signature}`
-
-  return {
-    'Content-Type': 'application/x-amz-json-1.1',
-    Host: host,
-    'X-Amz-Date': amzDate,
-    'X-Amz-Target': amzTarget,
-    Authorization: authorizationHeader,
-  }
-}
-
-async function fetchDocumentBytes(url: string): Promise<{ bytes: string; contentType: string }> {
-  const response = await fetch(url)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch document: ${response.statusText}`)
-  }
-
-  const arrayBuffer = await response.arrayBuffer()
-  const bytes = Buffer.from(arrayBuffer).toString('base64')
-  const contentType = response.headers.get('content-type') || 'application/octet-stream'
-
-  return { bytes, contentType }
-}
-
-function parseS3Uri(s3Uri: string): { bucket: string; key: string } {
-  const match = s3Uri.match(/^s3:\/\/([^/]+)\/(.+)$/)
-  if (!match) {
-    throw new Error(
-      `Invalid S3 URI format: ${s3Uri}. Expected format: s3://bucket-name/path/to/object`
-    )
-  }
-
-  const bucket = match[1]
-  const key = match[2]
-
-  const bucketValidation = validateS3BucketName(bucket, 'S3 bucket name')
-  if (!bucketValidation.isValid) {
-    throw new Error(bucketValidation.error)
-  }
-
-  if (key.includes('..') || key.startsWith('/')) {
-    throw new Error('S3 key contains invalid path traversal sequences')
-  }
-
-  return { bucket, key }
-}
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
-async function callTextractAsync(
-  host: string,
-  amzTarget: string,
-  body: Record<string, unknown>,
-  accessKeyId: string,
-  secretAccessKey: string,
-  region: string
-): Promise<Record<string, unknown>> {
-  const bodyString = JSON.stringify(body)
-  const headers = signAwsRequest(
-    'POST',
-    host,
-    '/',
-    bodyString,
-    accessKeyId,
-    secretAccessKey,
-    region,
-    'textract',
-    amzTarget
-  )
-
-  const response = await fetch(`https://${host}/`, {
-    method: 'POST',
-    headers,
-    body: bodyString,
-  })
-
-  if (!response.ok) {
-    const errorText = await response.text()
-    let errorMessage = `Textract API error: ${response.statusText}`
-    try {
-      const errorJson = JSON.parse(errorText)
-      if (errorJson.Message) {
-        errorMessage = errorJson.Message
-      } else if (errorJson.__type) {
-        errorMessage = `${errorJson.__type}: ${errorJson.message || errorText}`
-      }
-    } catch {
-      // Use default error message
-    }
-    throw new Error(errorMessage)
-  }
-
-  return response.json()
-}
-
-async function pollForJobCompletion(
-  host: string,
-  jobId: string,
-  accessKeyId: string,
-  secretAccessKey: string,
-  region: string,
-  useAnalyzeDocument: boolean,
-  requestId: string
-): Promise<Record<string, unknown>> {
-  const pollIntervalMs = 5000 // 5 seconds between polls
-  const maxPollTimeMs = 180000 // 3 minutes maximum polling time
-  const maxAttempts = Math.ceil(maxPollTimeMs / pollIntervalMs)
-
-  const getTarget = useAnalyzeDocument
-    ? 'Textract.GetDocumentAnalysis'
-    : 'Textract.GetDocumentTextDetection'
-
-  for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    const result = await callTextractAsync(
-      host,
-      getTarget,
-      { JobId: jobId },
-      accessKeyId,
-      secretAccessKey,
-      region
-    )
-
-    const jobStatus = result.JobStatus as string
-
-    if (jobStatus === 'SUCCEEDED') {
-      logger.info(`[${requestId}] Async job completed successfully after ${attempt + 1} polls`)
-
-      let allBlocks = (result.Blocks as unknown[]) || []
-      let nextToken = result.NextToken as string | undefined
-
-      while (nextToken) {
-        const nextResult = await callTextractAsync(
-          host,
-          getTarget,
-          { JobId: jobId, NextToken: nextToken },
-          accessKeyId,
-          secretAccessKey,
-          region
-        )
-        allBlocks = allBlocks.concat((nextResult.Blocks as unknown[]) || [])
-        nextToken = nextResult.NextToken as string | undefined
-      }
-
-      return {
-        ...result,
-        Blocks: allBlocks,
-      }
-    }
-
-    if (jobStatus === 'FAILED') {
-      throw new Error(`Textract job failed: ${result.StatusMessage || 'Unknown error'}`)
-    }
-
-    if (jobStatus === 'PARTIAL_SUCCESS') {
-      logger.warn(`[${requestId}] Job completed with partial success: ${result.StatusMessage}`)
-
-      let allBlocks = (result.Blocks as unknown[]) || []
-      let nextToken = result.NextToken as string | undefined
-
-      while (nextToken) {
-        const nextResult = await callTextractAsync(
-          host,
-          getTarget,
-          { JobId: jobId, NextToken: nextToken },
-          accessKeyId,
-          secretAccessKey,
-          region
-        )
-        allBlocks = allBlocks.concat((nextResult.Blocks as unknown[]) || [])
-        nextToken = nextResult.NextToken as string | undefined
-      }
-
-      return {
-        ...result,
-        Blocks: allBlocks,
-      }
-    }
-
-    logger.info(`[${requestId}] Job status: ${jobStatus}, attempt ${attempt + 1}/${maxAttempts}`)
-    await sleep(pollIntervalMs)
-  }
-
-  throw new Error(
-    `Timeout waiting for Textract job to complete (max ${maxPollTimeMs / 1000} seconds)`
-  )
-}
-
-export async function POST(request: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })
-
-    if (!authResult.success || !authResult.userId) {
-      logger.warn(`[${requestId}] Unauthorized Textract parse attempt`, {
-        error: authResult.error || 'Missing userId',
-      })
-      return NextResponse.json(
-        {
-          success: false,
-          error: authResult.error || 'Unauthorized',
-        },
-        { status: 401 }
-      )
-    }
-
-    const userId = authResult.userId
-    const body = await request.json()
-    const validatedData = TextractParseSchema.parse(body)
-
-    const processingMode = validatedData.processingMode || 'sync'
-    const featureTypes = validatedData.featureTypes ?? []
-    const useAnalyzeDocument = featureTypes.length > 0
-    const host = `textract.${validatedData.region}.amazonaws.com`
-
-    logger.info(`[${requestId}] Textract parse request`, {
-      processingMode,
-      filePath: validatedData.filePath?.substring(0, 50),
-      s3Uri: validatedData.s3Uri?.substring(0, 50),
-      featureTypes,
-      userId,
-    })
-
-    if (processingMode === 'async') {
-      if (!validatedData.s3Uri) {
-        return NextResponse.json(
-          {
-            success: false,
-            error: 'S3 URI is required for multi-page processing (s3://bucket/key)',
-          },
-          { status: 400 }
-        )
-      }
-
-      const { bucket: s3Bucket, key: s3Key } = parseS3Uri(validatedData.s3Uri)
-
-      logger.info(`[${requestId}] Starting async Textract job`, { s3Bucket, s3Key })
-
-      const startTarget = useAnalyzeDocument
-        ? 'Textract.StartDocumentAnalysis'
-        : 'Textract.StartDocumentTextDetection'
-
-      const startBody: Record<string, unknown> = {
-        DocumentLocation: {
-          S3Object: {
-            Bucket: s3Bucket,
-            Name: s3Key,
-          },
-        },
-      }
-
-      if (useAnalyzeDocument) {
-        startBody.FeatureTypes = featureTypes
-
-        if (
-          validatedData.queries &&
-          validatedData.queries.length > 0 &&
-          featureTypes.includes('QUERIES')
-        ) {
-          startBody.QueriesConfig = {
-            Queries: validatedData.queries.map((q) => ({
-              Text: q.Text,
-              Alias: q.Alias,
-              Pages: q.Pages,
-            })),
-          }
-        }
-      }
-
-      const startResult = await callTextractAsync(
-        host,
-        startTarget,
-        startBody,
-        validatedData.accessKeyId,
-        validatedData.secretAccessKey,
-        validatedData.region
-      )
-
-      const jobId = startResult.JobId as string
-      if (!jobId) {
-        throw new Error('Failed to start Textract job: No JobId returned')
-      }
-
-      logger.info(`[${requestId}] Async job started`, { jobId })
-
-      const textractData = await pollForJobCompletion(
-        host,
-        jobId,
-        validatedData.accessKeyId,
-        validatedData.secretAccessKey,
-        validatedData.region,
-        useAnalyzeDocument,
-        requestId
-      )
-
-      logger.info(`[${requestId}] Textract async parse successful`, {
-        pageCount: (textractData.DocumentMetadata as { Pages?: number })?.Pages ?? 0,
-        blockCount: (textractData.Blocks as unknown[])?.length ?? 0,
-      })
-
-      return NextResponse.json({
-        success: true,
-        output: {
-          blocks: textractData.Blocks ?? [],
-          documentMetadata: {
-            pages: (textractData.DocumentMetadata as { Pages?: number })?.Pages ?? 0,
-          },
-          modelVersion: (textractData.AnalyzeDocumentModelVersion ??
-            textractData.DetectDocumentTextModelVersion) as string | undefined,
-        },
-      })
-    }
-
-    if (!validatedData.filePath) {
-      return NextResponse.json(
-        {
-          success: false,
-          error: 'File path is required for single-page processing',
-        },
-        { status: 400 }
-      )
-    }
-
-    let fileUrl = validatedData.filePath
-
-    const isInternalFilePath = validatedData.filePath && isInternalFileUrl(validatedData.filePath)
-
-    if (isInternalFilePath) {
-      try {
-        const storageKey = extractStorageKey(validatedData.filePath)
-        const context = inferContextFromKey(storageKey)
-
-        const hasAccess = await verifyFileAccess(storageKey, userId, undefined, context, false)
-
-        if (!hasAccess) {
-          logger.warn(`[${requestId}] Unauthorized presigned URL generation attempt`, {
-            userId,
-            key: storageKey,
-            context,
-          })
-          return NextResponse.json(
-            {
-              success: false,
-              error: 'File not found',
-            },
-            { status: 404 }
-          )
-        }
-
-        fileUrl = await StorageService.generatePresignedDownloadUrl(storageKey, context, 5 * 60)
-        logger.info(`[${requestId}] Generated presigned URL for ${context} file`)
-      } catch (error) {
-        logger.error(`[${requestId}] Failed to generate presigned URL:`, error)
-        return NextResponse.json(
-          {
-            success: false,
-            error: 'Failed to generate file access URL',
-          },
-          { status: 500 }
-        )
-      }
-    } else if (validatedData.filePath?.startsWith('/')) {
-      // Reject arbitrary absolute paths that don't contain /api/files/serve/
-      logger.warn(`[${requestId}] Invalid internal path`, {
-        userId,
-        path: validatedData.filePath.substring(0, 50),
-      })
-      return NextResponse.json(
-        {
-          success: false,
-          error: 'Invalid file path. Only uploaded files are supported for internal paths.',
-        },
-        { status: 400 }
-      )
-    } else {
-      const urlValidation = validateExternalUrl(fileUrl, 'Document URL')
-      if (!urlValidation.isValid) {
-        logger.warn(`[${requestId}] SSRF attempt blocked`, {
-          userId,
-          url: fileUrl.substring(0, 100),
-          error: urlValidation.error,
-        })
-        return NextResponse.json(
-          {
-            success: false,
-            error: urlValidation.error,
-          },
-          { status: 400 }
-        )
-      }
-    }
-
-    const { bytes, contentType } = await fetchDocumentBytes(fileUrl)
-
-    // Track if this is a PDF for better error messaging
-    const isPdf = contentType.includes('pdf') || fileUrl.toLowerCase().endsWith('.pdf')
-
-    const uri = '/'
-
-    let textractBody: Record<string, unknown>
-    let amzTarget: string
-
-    if (useAnalyzeDocument) {
-      amzTarget = 'Textract.AnalyzeDocument'
-      textractBody = {
-        Document: {
-          Bytes: bytes,
-        },
-        FeatureTypes: featureTypes,
-      }
-
-      if (
-        validatedData.queries &&
-        validatedData.queries.length > 0 &&
-        featureTypes.includes('QUERIES')
-      ) {
-        textractBody.QueriesConfig = {
-          Queries: validatedData.queries.map((q) => ({
-            Text: q.Text,
-            Alias: q.Alias,
-            Pages: q.Pages,
-          })),
-        }
-      }
-    } else {
-      amzTarget = 'Textract.DetectDocumentText'
-      textractBody = {
-        Document: {
-          Bytes: bytes,
-        },
-      }
-    }
-
-    const bodyString = JSON.stringify(textractBody)
-
-    const headers = signAwsRequest(
-      'POST',
-      host,
-      uri,
-      bodyString,
-      validatedData.accessKeyId,
-      validatedData.secretAccessKey,
-      validatedData.region,
-      'textract',
-      amzTarget
-    )
-
-    const textractResponse = await fetch(`https://${host}${uri}`, {
-      method: 'POST',
-      headers,
-      body: bodyString,
-    })
-
-    if (!textractResponse.ok) {
-      const errorText = await textractResponse.text()
-      logger.error(`[${requestId}] Textract API error:`, errorText)
-
-      let errorMessage = `Textract API error: ${textractResponse.statusText}`
-      let isUnsupportedFormat = false
-      try {
-        const errorJson = JSON.parse(errorText)
-        if (errorJson.Message) {
-          errorMessage = errorJson.Message
-        } else if (errorJson.__type) {
-          errorMessage = `${errorJson.__type}: ${errorJson.message || errorText}`
-        }
-        // Check for unsupported document format error
-        isUnsupportedFormat =
-          errorJson.__type === 'UnsupportedDocumentException' ||
-          errorJson.Message?.toLowerCase().includes('unsupported document') ||
-          errorText.toLowerCase().includes('unsupported document')
-      } catch {
-        isUnsupportedFormat = errorText.toLowerCase().includes('unsupported document')
-      }
-
-      // Provide helpful message for unsupported format (likely multi-page PDF)
-      if (isUnsupportedFormat && isPdf) {
-        errorMessage =
-          'This document format is not supported in Single Page mode. If this is a multi-page PDF, please use "Multi-Page (PDF, TIFF via S3)" mode instead, which requires uploading your document to S3 first. Single Page mode only supports JPEG, PNG, and single-page PDF files.'
-      }
-
-      return NextResponse.json(
-        {
-          success: false,
-          error: errorMessage,
-        },
-        { status: textractResponse.status }
-      )
-    }
-
-    const textractData = await textractResponse.json()
-
-    logger.info(`[${requestId}] Textract parse successful`, {
-      pageCount: textractData.DocumentMetadata?.Pages ?? 0,
-      blockCount: textractData.Blocks?.length ?? 0,
-    })
-
-    return NextResponse.json({
-      success: true,
-      output: {
-        blocks: textractData.Blocks ?? [],
-        documentMetadata: {
-          pages: textractData.DocumentMetadata?.Pages ?? 0,
-        },
-        modelVersion:
-          textractData.AnalyzeDocumentModelVersion ??
-          textractData.DetectDocumentTextModelVersion ??
-          undefined,
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
-      return NextResponse.json(
-        {
-          success: false,
-          error: 'Invalid request data',
-          details: error.errors,
-        },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error in Textract parse:`, error)
-
-    return NextResponse.json(
-      {
-        success: false,
-        error: error instanceof Error ? error.message : 'Internal server error',
-      },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -12,10 +12,6 @@ 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'
@@ -29,7 +25,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 { NormalizedBlockOutput, StreamingExecution } from '@/executor/types'
+import type { StreamingExecution } from '@/executor/types'
 import { Serializer } from '@/serializer'
 import { CORE_TRIGGER_TYPES, type CoreTriggerType } from '@/stores/logs/filters/types'

@@ -42,8 +38,6 @@ 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()),
@@ -220,8 +214,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      useDraftState,
      input: validatedInput,
      isClientSession = false,
-      includeFileBase64,
-      base64MaxBytes,
      workflowStateOverride,
    } = validation.data

@@ -235,8 +227,6 @@ 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
@@ -437,31 +427,16 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
          snapshot,
          callbacks: {},
          loggingSession,
-          includeFileBase64,
-          base64MaxBytes,
        })

-        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)
+        const hasResponseBlock = workflowHasResponseBlock(result)
        if (hasResponseBlock) {
-          return createHttpResponseFromBlock(resultWithBase64)
+          return createHttpResponseFromBlock(result)
        }

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

          if (result.status === 'paused') {
@@ -779,21 +750,12 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
            workflowId,
            data: {
              success: result.success,
-              output: includeFileBase64
-                ? await hydrateUserFilesWithBase64(result.output, {
-                    requestId,
-                    executionId,
-                    maxBytes: base64MaxBytes,
-                  })
-                : result.output,
+              output: 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/api/workflows/[id]/state/route.ts
+++ b/apps/sim/app/api/workflows/[id]/state/route.ts
@@ -33,7 +33,6 @@ const BlockDataSchema = z.object({
  doWhileCondition: z.string().optional(),
  parallelType: z.enum(['collection', 'count']).optional(),
  type: z.string().optional(),
-  canonicalModes: z.record(z.enum(['basic', 'advanced'])).optional(),
 })

 const SubBlockStateSchema = z.object({
--- a/apps/sim/app/changelog/components/branded-link.tsx
+++ b/apps/sim/app/changelog/components/branded-link.tsx
@@ -1,27 +0,0 @@
-'use client'
-
-import Link from 'next/link'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
-
-interface BrandedLinkProps {
-  href: string
-  children: React.ReactNode
-  className?: string
-  target?: string
-  rel?: string
-}
-
-export function BrandedLink({ href, children, className = '', target, rel }: BrandedLinkProps) {
-  const buttonClass = useBrandedButtonClass()
-
-  return (
-    <Link
-      href={href}
-      target={target}
-      rel={rel}
-      className={`${buttonClass} group inline-flex items-center justify-center gap-2 rounded-[10px] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white transition-all ${className}`}
-    >
-      {children}
-    </Link>
-  )
-}
--- a/apps/sim/app/changelog/components/changelog-content.tsx
+++ b/apps/sim/app/changelog/components/changelog-content.tsx
@@ -2,7 +2,6 @@ import { BookOpen, Github, Rss } from 'lucide-react'
 import Link from 'next/link'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedLink } from '@/app/changelog/components/branded-link'
 import ChangelogList from '@/app/changelog/components/timeline-list'

 export interface ChangelogEntry {
@@ -67,24 +66,25 @@ export default async function ChangelogContent() {
            <hr className='mt-6 border-border' />

            <div className='mt-6 flex flex-wrap items-center gap-3 text-sm'>
-              <BrandedLink
+              <Link
                href='https://github.com/simstudioai/sim/releases'
                target='_blank'
                rel='noopener noreferrer'
+                className='group inline-flex items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[14px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all sm:text-[16px]'
              >
                <Github className='h-4 w-4' />
                View on GitHub
-              </BrandedLink>
+              </Link>
              <Link
                href='https://docs.sim.ai'
-                className='inline-flex items-center gap-2 rounded-[10px] border border-border py-[6px] pr-[10px] pl-[12px] text-[15px] transition-all hover:bg-muted'
+                className='inline-flex items-center gap-2 rounded-md border border-border px-3 py-1.5 hover:bg-muted'
              >
                <BookOpen className='h-4 w-4' />
                Documentation
              </Link>
              <Link
                href='/changelog.xml'
-                className='inline-flex items-center gap-2 rounded-[10px] border border-border py-[6px] pr-[10px] pl-[12px] text-[15px] transition-all hover:bg-muted'
+                className='inline-flex items-center gap-2 rounded-md border border-border px-3 py-1.5 hover:bg-muted'
              >
                <Rss className='h-4 w-4' />
                RSS Feed
--- a/apps/sim/app/chat/[identifier]/chat.tsx
+++ b/apps/sim/app/chat/[identifier]/chat.tsx
@@ -117,7 +117,7 @@ export default function ChatClient({ identifier }: { identifier: string }) {
  const [error, setError] = useState<string | null>(null)
  const messagesEndRef = useRef<HTMLDivElement>(null)
  const messagesContainerRef = useRef<HTMLDivElement>(null)
-  const [starCount, setStarCount] = useState('25.8k')
+  const [starCount, setStarCount] = useState('25.1k')
  const [conversationId, setConversationId] = useState('')

  const [showScrollButton, setShowScrollButton] = useState(false)
--- 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 { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
+import { isUserFile } from '@/lib/core/utils/display-filters'
 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 (isUserFileWithMetadata(data)) {
+  if (isUserFile(data)) {
    if (!seenIds.has(data.id)) {
      seenIds.add(data.id)
      files.push({
@@ -232,7 +232,7 @@ export function useChatStreaming() {
                    return null
                  }

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

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

                    const value = getOutputValue(blockOutputs, config.path)

-                    if (isUserFileWithMetadata(value)) {
+                    if (isUserFile(value)) {
                      extractedFiles.push({
                        id: value.id,
                        name: value.name,
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/document.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/document.tsx
@@ -538,11 +538,15 @@ export function Document({
      },
      {
        onSuccess: (result) => {
-          if (operation === 'delete' || result.errorCount > 0) {
+          if (operation === 'delete') {
            refreshChunks()
          } else {
-            chunks.forEach((chunk) => {
-              updateChunk(chunk.id, { enabled: operation === 'enable' })
+            result.results.forEach((opResult) => {
+              if (opResult.operation === operation) {
+                opResult.chunkIds.forEach((chunkId: string) => {
+                  updateChunk(chunkId, { enabled: operation === 'enable' })
+                })
+              }
            })
          }
          logger.info(`Successfully ${operation}d ${result.successCount} chunks`)
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx
@@ -462,7 +462,7 @@ export function BaseTagsModal({ open, onOpenChange, knowledgeBaseId }: BaseTagsM
          <ModalHeader>Documents using "{selectedTag?.displayName}"</ModalHeader>
          <ModalBody>
            <div className='space-y-[8px]'>
-              <p className='text-[12px] text-[var(--text-secondary)]'>
+              <p className='text-[12px] text-[var(--text-tertiary)]'>
                {selectedTagUsage?.documentCount || 0} document
                {selectedTagUsage?.documentCount !== 1 ? 's are' : ' is'} currently using this tag
                definition.
@@ -470,7 +470,7 @@ export function BaseTagsModal({ open, onOpenChange, knowledgeBaseId }: BaseTagsM

              {selectedTagUsage?.documentCount === 0 ? (
                <div className='rounded-[6px] border p-[16px] text-center'>
-                  <p className='text-[12px] text-[var(--text-secondary)]'>
+                  <p className='text-[12px] text-[var(--text-tertiary)]'>
                    This tag definition is not being used by any documents. You can safely delete it
                    to free up the tag slot.
                  </p>
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/trace-spans/trace-spans.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/trace-spans/trace-spans.tsx
@@ -234,7 +234,7 @@ function ProgressBar({
      {segments.map((segment, index) => (
        <div
          key={index}
-          className='absolute h-full opacity-70'
+          className='absolute h-full'
          style={{
            left: `${segment.startPercent}%`,
            width: `${segment.widthPercent}%`,
--- 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
@@ -257,7 +257,7 @@ export const LogDetails = memo(function LogDetails({
                        Version
                      </span>
                      <div className='flex w-0 flex-1 justify-end'>
-                        <span className='max-w-full truncate rounded-[6px] bg-[#bbf7d0] px-[9px] py-[2px] font-medium text-[#15803d] text-[12px] dark:bg-[#14291B] dark:text-[#86EFAC]'>
+                        <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}`}
                        </span>
                      </div>
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/logs-toolbar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/logs-toolbar.tsx
@@ -19,7 +19,6 @@ import { DatePicker } from '@/components/emcn/components/date-picker/date-picker
 import { cn } from '@/lib/core/utils/cn'
 import { hasActiveFilters } from '@/lib/logs/filters'
 import { getTriggerOptions } from '@/lib/logs/get-trigger-options'
-import { type LogStatus, STATUS_CONFIG } from '@/app/workspace/[workspaceId]/logs/utils'
 import { getBlock } from '@/blocks/registry'
 import { useFolderStore } from '@/stores/folders/store'
 import { useFilterStore } from '@/stores/logs/filters/store'
@@ -212,12 +211,12 @@ export function LogsToolbar({
  }, [level])

  const statusOptions: ComboboxOption[] = useMemo(
-    () =>
-      (Object.keys(STATUS_CONFIG) as LogStatus[]).map((status) => ({
-        value: status,
-        label: STATUS_CONFIG[status].label,
-        icon: getColorIcon(STATUS_CONFIG[status].color),
-      })),
+    () => [
+      { value: 'error', label: 'Error', icon: getColorIcon('var(--text-error)') },
+      { value: 'info', label: 'Info', icon: getColorIcon('var(--terminal-status-info-color)') },
+      { value: 'running', label: 'Running', icon: getColorIcon('#22c55e') },
+      { value: 'pending', label: 'Pending', icon: getColorIcon('#f59e0b') },
+    ],
    []
  )

@@ -243,8 +242,12 @@ export function LogsToolbar({

  const selectedStatusColor = useMemo(() => {
    if (selectedStatuses.length !== 1) return null
-    const status = selectedStatuses[0] as LogStatus
-    return STATUS_CONFIG[status]?.color ?? null
+    const status = selectedStatuses[0]
+    if (status === 'error') return 'var(--text-error)'
+    if (status === 'info') return 'var(--terminal-status-info-color)'
+    if (status === 'running') return '#22c55e'
+    if (status === 'pending') return '#f59e0b'
+    return null
  }, [selectedStatuses])

  const workflowOptions: ComboboxOption[] = useMemo(
--- a/apps/sim/app/workspace/[workspaceId]/logs/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/logs/utils.ts
@@ -5,6 +5,7 @@ import { getIntegrationMetadata } from '@/lib/logs/get-trigger-options'
 import { getBlock } from '@/blocks/registry'
 import { CORE_TRIGGER_TYPES } from '@/stores/logs/filters/types'

+/** Column configuration for logs table - shared between header and rows */
 export const LOG_COLUMNS = {
  date: { width: 'w-[8%]', minWidth: 'min-w-[70px]', label: 'Date' },
  time: { width: 'w-[12%]', minWidth: 'min-w-[90px]', label: 'Time' },
@@ -15,8 +16,10 @@ export const LOG_COLUMNS = {
  duration: { width: 'w-[20%]', minWidth: 'min-w-[100px]', label: 'Duration' },
 } as const

+/** Type-safe column key derived from LOG_COLUMNS */
 export type LogColumnKey = keyof typeof LOG_COLUMNS

+/** Ordered list of column keys for rendering table headers */
 export const LOG_COLUMN_ORDER: readonly LogColumnKey[] = [
  'date',
  'time',
@@ -27,6 +30,7 @@ export const LOG_COLUMN_ORDER: readonly LogColumnKey[] = [
  'duration',
 ] as const

+/** Possible execution status values for workflow logs */
 export type LogStatus = 'error' | 'pending' | 'running' | 'info' | 'cancelled'

 /**
@@ -49,28 +53,30 @@ export function getDisplayStatus(status: string | null | undefined): LogStatus {
  }
 }

-export const STATUS_CONFIG: Record<
+/** Configuration mapping log status to Badge variant and display label */
+const STATUS_VARIANT_MAP: Record<
  LogStatus,
-  { variant: React.ComponentProps<typeof Badge>['variant']; label: string; color: string }
+  { variant: React.ComponentProps<typeof Badge>['variant']; label: string }
 > = {
-  error: { variant: 'red', label: 'Error', color: 'var(--text-error)' },
-  pending: { variant: 'amber', label: 'Pending', color: '#f59e0b' },
-  running: { variant: 'green', label: 'Running', color: '#22c55e' },
-  cancelled: { variant: 'orange', label: 'Cancelled', color: '#f97316' },
-  info: { variant: 'gray', label: 'Info', color: 'var(--terminal-status-info-color)' },
+  error: { variant: 'red', label: 'Error' },
+  pending: { variant: 'amber', label: 'Pending' },
+  running: { variant: 'green', label: 'Running' },
+  cancelled: { variant: 'gray', label: 'Cancelled' },
+  info: { variant: 'gray', label: 'Info' },
 }

+/** Configuration mapping core trigger types to Badge color variants */
 const TRIGGER_VARIANT_MAP: Record<string, React.ComponentProps<typeof Badge>['variant']> = {
  manual: 'gray-secondary',
  api: 'blue',
  schedule: 'green',
  chat: 'purple',
  webhook: 'orange',
-  mcp: 'cyan',
  a2a: 'teal',
 }

 interface StatusBadgeProps {
+  /** The execution status to display */
  status: LogStatus
 }

@@ -80,13 +86,14 @@ interface StatusBadgeProps {
 * @returns A Badge with dot indicator and status label
 */
 export const StatusBadge = React.memo(({ status }: StatusBadgeProps) => {
-  const config = STATUS_CONFIG[status]
+  const config = STATUS_VARIANT_MAP[status]
  return React.createElement(Badge, { variant: config.variant, dot: true }, config.label)
 })

 StatusBadge.displayName = 'StatusBadge'

 interface TriggerBadgeProps {
+  /** The trigger type identifier (e.g., 'manual', 'api', or integration block type) */
  trigger: string
 }

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
@@ -2,12 +2,12 @@ import { memo, useCallback } from 'react'
 import { ArrowLeftRight, ArrowUpDown, Circle, CircleOff, LogOut } from 'lucide-react'
 import { Button, Copy, Tooltip, Trash2 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
-import { isInputDefinitionTrigger } from '@/lib/workflows/triggers/input-definition-triggers'
+import { isValidStartBlockType } from '@/lib/workflows/triggers/start-block-types'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { validateTriggerPaste } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
-import { useNotificationStore } from '@/stores/notifications'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import { useSubBlockStore } from '@/stores/workflows/subblock/store'
+import { getUniqueBlockName, prepareDuplicateBlockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'

 const DEFAULT_DUPLICATE_OFFSET = { x: 50, y: 50 }
@@ -48,38 +48,29 @@ export const ActionBar = memo(
      collaborativeBatchToggleBlockEnabled,
      collaborativeBatchToggleBlockHandles,
    } = useCollaborativeWorkflow()
-    const { setPendingSelection } = useWorkflowRegistry()
-
-    const addNotification = useNotificationStore((s) => s.addNotification)
+    const { activeWorkflowId, setPendingSelection } = useWorkflowRegistry()

    const handleDuplicateBlock = useCallback(() => {
-      const { copyBlocks, preparePasteData, activeWorkflowId } = useWorkflowRegistry.getState()
-      const existingBlocks = useWorkflowStore.getState().blocks
-      copyBlocks([blockId])
+      const blocks = useWorkflowStore.getState().blocks
+      const sourceBlock = blocks[blockId]
+      if (!sourceBlock) return

-      const pasteData = preparePasteData(DEFAULT_DUPLICATE_OFFSET)
-      if (!pasteData) return
+      const newId = crypto.randomUUID()
+      const newName = getUniqueBlockName(sourceBlock.name, blocks)
+      const subBlockValues =
+        useSubBlockStore.getState().workflowValues[activeWorkflowId || '']?.[blockId] || {}

-      const blocks = Object.values(pasteData.blocks)
-      const validation = validateTriggerPaste(blocks, existingBlocks, 'duplicate')
-      if (!validation.isValid) {
-        addNotification({
-          level: 'error',
-          message: validation.message!,
-          workflowId: activeWorkflowId || undefined,
-        })
-        return
-      }
+      const { block, subBlockValues: filteredValues } = prepareDuplicateBlockState({
+        sourceBlock,
+        newId,
+        newName,
+        positionOffset: DEFAULT_DUPLICATE_OFFSET,
+        subBlockValues,
+      })

-      setPendingSelection(blocks.map((b) => b.id))
-      collaborativeBatchAddBlocks(
-        blocks,
-        pasteData.edges,
-        pasteData.loops,
-        pasteData.parallels,
-        pasteData.subBlockValues
-      )
-    }, [blockId, addNotification, collaborativeBatchAddBlocks, setPendingSelection])
+      setPendingSelection([newId])
+      collaborativeBatchAddBlocks([block], [], {}, {}, { [newId]: filteredValues })
+    }, [blockId, activeWorkflowId, collaborativeBatchAddBlocks, setPendingSelection])

    const { isEnabled, horizontalHandles, parentId, parentType } = useWorkflowStore(
      useCallback(
@@ -99,7 +90,7 @@ export const ActionBar = memo(

    const userPermissions = useUserPermissionsContext()

-    const isStartBlock = isInputDefinitionTrigger(blockType)
+    const isStartBlock = isValidStartBlockType(blockType)
    const isResponseBlock = blockType === 'response'
    const isNoteBlock = blockType === 'note'
    const isSubflowBlock = blockType === 'loop' || blockType === 'parallel'
@@ -151,7 +142,7 @@ export const ActionBar = memo(
          </Tooltip.Root>
        )}

-        {!isStartBlock && !isResponseBlock && (
+        {!isStartBlock && !isResponseBlock && !isSubflowBlock && (
          <Tooltip.Root>
            <Tooltip.Trigger asChild>
              <Button
@@ -222,29 +213,6 @@ export const ActionBar = memo(
          </Tooltip.Root>
        )}

-        {isSubflowBlock && (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <Button
-                variant='ghost'
-                onClick={(e) => {
-                  e.stopPropagation()
-                  if (!disabled) {
-                    collaborativeBatchToggleBlockEnabled([blockId])
-                  }
-                }}
-                className={ACTION_BUTTON_STYLES}
-                disabled={disabled}
-              >
-                {isEnabled ? <Circle className={ICON_SIZE} /> : <CircleOff className={ICON_SIZE} />}
-              </Button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              {getTooltipMessage(isEnabled ? 'Disable Block' : 'Enable Block')}
-            </Tooltip.Content>
-          </Tooltip.Root>
-        )}
-
        <Tooltip.Root>
          <Tooltip.Trigger asChild>
            <Button
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/block-menu/block-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/block-menu/block-menu.tsx
@@ -8,7 +8,7 @@ import {
  PopoverDivider,
  PopoverItem,
 } from '@/components/emcn'
-import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
+import { isValidStartBlockType } from '@/lib/workflows/triggers/start-block-types'

 /**
 * Block information for context menu actions
@@ -74,16 +74,12 @@ export function BlockMenu({
  const allEnabled = selectedBlocks.every((b) => b.enabled)
  const allDisabled = selectedBlocks.every((b) => !b.enabled)

-  const hasSingletonBlock = selectedBlocks.some(
-    (b) =>
-      TriggerUtils.requiresSingleInstance(b.type) || TriggerUtils.isSingleInstanceBlockType(b.type)
-  )
-  const hasTriggerBlock = selectedBlocks.some((b) => TriggerUtils.isTriggerBlock(b))
+  const hasStarterBlock = selectedBlocks.some((b) => isValidStartBlockType(b.type))
  const allNoteBlocks = selectedBlocks.every((b) => b.type === 'note')
  const isSubflow =
    isSingleBlock && (selectedBlocks[0]?.type === 'loop' || selectedBlocks[0]?.type === 'parallel')

-  const canRemoveFromSubflow = showRemoveFromSubflow && !hasTriggerBlock
+  const canRemoveFromSubflow = showRemoveFromSubflow && !hasStarterBlock

  const getToggleEnabledLabel = () => {
    if (allEnabled) return 'Disable'
@@ -131,7 +127,7 @@ export function BlockMenu({
          <span>Paste</span>
          <span className='ml-auto opacity-70 group-hover:opacity-100'>⌘V</span>
        </PopoverItem>
-        {!hasSingletonBlock && (
+        {!hasStarterBlock && (
          <PopoverItem
            disabled={disableEdit}
            onClick={() => {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/canvas-menu/canvas-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/canvas-menu/canvas-menu.tsx
@@ -26,6 +26,7 @@ export interface CanvasMenuProps {
  onOpenLogs: () => void
  onToggleVariables: () => void
  onToggleChat: () => void
+  onInvite: () => void
  isVariablesOpen?: boolean
  isChatOpen?: boolean
  hasClipboard?: boolean
@@ -54,12 +55,15 @@ export function CanvasMenu({
  onOpenLogs,
  onToggleVariables,
  onToggleChat,
+  onInvite,
  isVariablesOpen = false,
  isChatOpen = false,
  hasClipboard = false,
  disableEdit = false,
+  disableAdmin = false,
  canUndo = false,
  canRedo = false,
+  isInvitationsDisabled = false,
 }: CanvasMenuProps) {
  return (
    <Popover
@@ -175,6 +179,22 @@ export function CanvasMenu({
        >
          {isChatOpen ? 'Close Chat' : 'Open Chat'}
        </PopoverItem>
+
+        {/* Admin action - hidden when invitations are disabled */}
+        {!isInvitationsDisabled && (
+          <>
+            <PopoverDivider />
+            <PopoverItem
+              disabled={disableAdmin}
+              onClick={() => {
+                onInvite()
+                onClose()
+              }}
+            >
+              Invite to Workspace
+            </PopoverItem>
+          </>
+        )}
      </PopoverContent>
    </Popover>
  )
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
@@ -886,16 +886,17 @@ export function Chat() {
          onMouseDown={(e) => e.stopPropagation()}
        >
          {shouldShowConfigureStartInputsButton && (
-            <div
-              className='flex flex-none cursor-pointer items-center whitespace-nowrap rounded-[6px] border border-[var(--border-1)] bg-[var(--surface-5)] px-[9px] py-[2px] font-medium font-sans text-[12px] text-[var(--text-primary)] hover:bg-[var(--surface-7)] dark:hover:border-[var(--surface-7)] dark:hover:bg-[var(--border-1)]'
+            <Badge
+              variant='outline'
+              className='flex-none cursor-pointer whitespace-nowrap rounded-[6px]'
              title='Add chat inputs to Start block'
              onMouseDown={(e) => {
                e.stopPropagation()
                handleConfigureStartInputs()
              }}
            >
-              <span className='whitespace-nowrap'>Add inputs</span>
-            </div>
+              <span className='whitespace-nowrap text-[12px]'>Add inputs</span>
+            </Badge>
          )}

          <OutputSelect
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/output-select/output-select.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/output-select/output-select.tsx
@@ -129,6 +129,10 @@ export function OutputSelect({
          ? baselineWorkflow.blocks?.[block.id]?.subBlocks?.responseFormat?.value
          : subBlockValues?.[block.id]?.responseFormat
      const responseFormat = parseResponseFormatSafely(responseFormatValue, block.id)
+      const operationValue =
+        shouldUseBaseline && baselineWorkflow
+          ? baselineWorkflow.blocks?.[block.id]?.subBlocks?.operation?.value
+          : subBlockValues?.[block.id]?.operation

      let outputsToProcess: Record<string, unknown> = {}

@@ -142,20 +146,10 @@ export function OutputSelect({
          outputsToProcess = blockConfig?.outputs || {}
        }
      } else {
-        // Build subBlocks object for tool selector
-        const rawSubBlockValues =
-          shouldUseBaseline && baselineWorkflow
-            ? baselineWorkflow.blocks?.[block.id]?.subBlocks
-            : subBlockValues?.[block.id]
-        const subBlocks: Record<string, { value: unknown }> = {}
-        if (rawSubBlockValues && typeof rawSubBlockValues === 'object') {
-          for (const [key, val] of Object.entries(rawSubBlockValues)) {
-            // Handle both { value: ... } and raw value formats
-            subBlocks[key] = val && typeof val === 'object' && 'value' in val ? val : { value: val }
-          }
-        }
-
-        const toolOutputs = blockConfig ? getToolOutputs(blockConfig, subBlocks) : {}
+        const toolOutputs =
+          blockConfig && typeof operationValue === 'string'
+            ? getToolOutputs(blockConfig, operationValue)
+            : {}
        outputsToProcess =
          Object.keys(toolOutputs).length > 0 ? toolOutputs : blockConfig?.outputs || {}
      }
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications.tsx
@@ -138,24 +138,18 @@ export const Notifications = memo(function Notifications() {
            }`}
          >
            <div className='flex h-full flex-col justify-between px-[8px] pt-[6px] pb-[8px]'>
-              <div className='flex items-start gap-[8px]'>
-                <div
-                  className={`min-w-0 flex-1 font-medium text-[12px] leading-[16px] ${
-                    hasAction ? 'line-clamp-2' : 'line-clamp-4'
-                  }`}
-                >
-                  {notification.level === 'error' && (
-                    <span className='mr-[6px] mb-[2.75px] inline-block h-[6px] w-[6px] rounded-[2px] bg-[var(--text-error)] align-middle' />
-                  )}
-                  {notification.message}
-                </div>
+              <div
+                className={`font-medium text-[12px] leading-[16px] ${
+                  hasAction ? 'line-clamp-2' : 'line-clamp-4'
+                }`}
+              >
                <Tooltip.Root>
                  <Tooltip.Trigger asChild>
                    <Button
                      variant='ghost'
                      onClick={() => removeNotification(notification.id)}
                      aria-label='Dismiss notification'
-                      className='!p-1.5 -m-1.5 shrink-0'
+                      className='!p-1.5 -m-1.5 float-right ml-[16px]'
                    >
                      <X className='h-3 w-3' />
                    </Button>
@@ -164,6 +158,10 @@ export const Notifications = memo(function Notifications() {
                    <Tooltip.Shortcut keys='⌘E'>Clear all</Tooltip.Shortcut>
                  </Tooltip.Content>
                </Tooltip.Root>
+                {notification.level === 'error' && (
+                  <span className='mr-[6px] mb-[2.75px] inline-block h-[6px] w-[6px] rounded-[2px] bg-[var(--text-error)] align-middle' />
+                )}
+                {notification.message}
              </div>
              {hasAction && (
                <Button
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Siddharth Ganesan	f28bbacb32	v0.2	2026-01-20 14:51:40 -08:00
Siddharth Ganesan	41d7c2847d	v0.1	2026-01-20 10:06:18 -08:00
Siddharth Ganesan	5da1dfb5e4	v0	2026-01-19 19:46:56 -08:00
				`@@ -1 +0,0 @@`
				`export { default as CopilotMarkdownRenderer } from './markdown-renderer'`