v0.5.66: external http requests fix, ring highlighting

* fix(google): wrap primitive tool responses for Gemini API compatibility (#2900)

* fix(canonical): copilot path + update parent (#2901)

* fix(rss): add top-level title, link, pubDate fields to RSS trigger output (#2902)

* fix(rss): add top-level title, link, pubDate fields to RSS trigger output

* fix(imap): add top-level fields to IMAP trigger output

* improvement(browseruse): add profile id param (#2903)

* improvement(browseruse): add profile id param

* make request a stub since we have directExec

* improvement(executor): upgraded abort controller to handle aborts for loops and parallels (#2880)

* improvement(executor): upgraded abort controller to handle aborts for loops and parallels

* comments

* improvement(files): update execution for passing base64 strings (#2906)

* progress

* improvement(execution): update execution for passing base64 strings

* fix types

* cleanup comments

* path security vuln

* reject promise correctly

* fix redirect case

* remove proxy routes

* fix tests

* use ipaddr

* feat(tools): added textract, added v2 for mistral, updated tag dropdown (#2904)

* feat(tools): added textract

* cleanup

* ack pr comments

* reorder

* removed upload for textract async version

* fix additional fields dropdown in editor, update parser to leave validation to be done on the server

* added mistral v2, files v2, and finalized textract

* updated the rest of the old file patterns, updated mistral outputs for v2

* updated tag dropdown to parse non-operation fields as well

* updated extension finder

* cleanup

* added description for inputs to workflow

* use helper for internal route check

* fix tag dropdown merge conflict change

* remove duplicate code

---------

Co-authored-by: Vikhyath Mondreti <vikhyath@simstudio.ai>

* fix(ui): change add inputs button to match output selector (#2907)

* fix(canvas): removed invite to workspace from canvas popover (#2908)

* fix(canvas): removed invite to workspace

* removed unused props

* fix(copilot): legacy tool display names (#2911)

* fix(a2a): canonical merge  (#2912)

* fix canonical merge

* fix empty array case

* fix(change-detection): copilot diffs have extra field (#2913)

* improvement(logs): improved logs ui bugs, added subflow disable UI (#2910)

* improvement(logs): improved logs ui bugs, added subflow disable UI

* added duplicate to action bar for subflows

* feat(broadcast): email v0.5 (#2905)

---------

Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Co-authored-by: Vikhyath Mondreti <vikhyath@simstudio.ai>
Co-authored-by: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com>

apps/docs/components/icons.tsx

@@ -4696,26 +4696,6 @@ export function BedrockIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
-export function TableIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      xmlns='http://www.w3.org/2000/svg'
-      viewBox='0 0 24 24'
-      fill='none'
-      stroke='currentColor'
-      strokeWidth={2}
-      strokeLinecap='round'
-      strokeLinejoin='round'
-      {...props}
-    >
-      <rect width='18' height='18' x='3' y='3' rx='2' />
-      <path d='M3 9h18' />
-      <path d='M3 15h18' />
-      <path d='M9 3v18' />
-      <path d='M15 3v18' />
-    </svg>
-  )
-}
 export function ReductoIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg

apps/docs/components/ui/icon-mapping.ts

@@ -108,7 +108,6 @@ import {
   StagehandIcon,
   StripeIcon,
   SupabaseIcon,
-  TableIcon,
   TavilyIcon,
   TelegramIcon,
   TextractIcon,
@@ -237,7 +236,6 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   stripe: StripeIcon,
   stt: STTIcon,
   supabase: SupabaseIcon,
-  table: TableIcon,
   tavily: TavilyIcon,
   telegram: TelegramIcon,
   textract: TextractIcon,

apps/docs/content/docs/en/tools/meta.json

@@ -104,7 +104,6 @@
     "stripe",
     "stt",
     "supabase",
-    "table",
     "tavily",
     "telegram",
     "textract",

apps/docs/content/docs/en/tools/table.mdx

@@ -1,351 +0,0 @@
----
-title: Table
-description: User-defined data tables for storing and querying structured data
----
-
-import { BlockInfoCard } from "@/components/ui/block-info-card"
-
-<BlockInfoCard 
-  type="table"
-  color="#10B981"
-/>
-
-Tables allow you to create and manage custom data tables directly within Sim. Store, query, and manipulate structured data within your workflows without needing external database integrations.
-
-**Why Use Tables?**
-- **No external setup**: Create tables instantly without configuring external databases
-- **Workflow-native**: Data persists across workflow executions and is accessible from any workflow in your workspace
-- **Flexible schema**: Define columns with types (string, number, boolean, date, json) and constraints (required, unique)
-- **Powerful querying**: Filter, sort, and paginate data using MongoDB-style operators
-- **Agent-friendly**: Tables can be used as tools by AI agents for dynamic data storage and retrieval
-
-**Key Features:**
-- Create tables with custom schemas
-- Insert, update, upsert, and delete rows
-- Query with filters and sorting
-- Batch operations for bulk inserts
-- Bulk updates and deletes by filter
-- Up to 10,000 rows per table, 100 tables per workspace
-
-## Creating Tables
-
-Tables are created from the **Tables** section in the sidebar. Each table requires:
-- **Name**: Alphanumeric with underscores (e.g., `customer_leads`)
-- **Description**: Optional description of the table's purpose
-- **Schema**: Define columns with name, type, and optional constraints
-
-### Column Types
-
-| Type | Description | Example Values |
-|------|-------------|----------------|
-| `string` | Text data | `"John Doe"`, `"active"` |
-| `number` | Numeric data | `42`, `99.99` |
-| `boolean` | True/false values | `true`, `false` |
-| `date` | Date/time values | `"2024-01-15T10:30:00Z"` |
-| `json` | Complex nested data | `{"address": {"city": "NYC"}}` |
-
-### Column Constraints
-
-- **Required**: Column must have a value (cannot be null)
-- **Unique**: Values must be unique across all rows (enables upsert matching)
-
-## Usage Instructions
-
-Create and manage custom data tables. Store, query, and manipulate structured data within workflows.
-
-## Tools
-
-### `table_query_rows`
-
-Query rows from a table with filtering, sorting, and pagination
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `filter` | object | No | Filter conditions using MongoDB-style operators |
-| `sort` | object | No | Sort order as \{column: "asc"\|"desc"\} |
-| `limit` | number | No | Maximum rows to return \(default: 100, max: 1000\) |
-| `offset` | number | No | Number of rows to skip \(default: 0\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether query succeeded |
-| `rows` | array | Query result rows |
-| `rowCount` | number | Number of rows returned |
-| `totalCount` | number | Total rows matching filter |
-| `limit` | number | Limit used in query |
-| `offset` | number | Offset used in query |
-
-### `table_insert_row`
-
-Insert a new row into a table
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `data` | object | Yes | Row data as JSON object matching the table schema |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether row was inserted |
-| `row` | object | Inserted row data including generated ID |
-| `message` | string | Status message |
-
-### `table_upsert_row`
-
-Insert or update a row based on unique column constraints. If a row with matching unique field exists, update it; otherwise insert a new row.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `data` | object | Yes | Row data to insert or update |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether row was upserted |
-| `row` | object | Upserted row data |
-| `operation` | string | Operation performed: "insert" or "update" |
-| `message` | string | Status message |
-
-### `table_batch_insert_rows`
-
-Insert multiple rows at once (up to 1000 rows per batch)
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `rows` | array | Yes | Array of row data objects to insert |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether batch insert succeeded |
-| `rows` | array | Array of inserted rows with IDs |
-| `insertedCount` | number | Number of rows inserted |
-| `message` | string | Status message |
-
-### `table_update_row`
-
-Update a specific row by its ID
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `rowId` | string | Yes | Row ID to update |
-| `data` | object | Yes | Data to update \(partial update supported\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether row was updated |
-| `row` | object | Updated row data |
-| `message` | string | Status message |
-
-### `table_update_rows_by_filter`
-
-Update multiple rows matching a filter condition
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `filter` | object | Yes | Filter to match rows for update |
-| `data` | object | Yes | Data to apply to matching rows |
-| `limit` | number | No | Maximum rows to update \(default: 1000\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether update succeeded |
-| `updatedCount` | number | Number of rows updated |
-| `updatedRowIds` | array | IDs of updated rows |
-| `message` | string | Status message |
-
-### `table_delete_row`
-
-Delete a specific row by its ID
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `rowId` | string | Yes | Row ID to delete |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether row was deleted |
-| `deletedCount` | number | Number of rows deleted \(1 or 0\) |
-| `message` | string | Status message |
-
-### `table_delete_rows_by_filter`
-
-Delete multiple rows matching a filter condition
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `filter` | object | Yes | Filter to match rows for deletion |
-| `limit` | number | No | Maximum rows to delete \(default: 1000\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether delete succeeded |
-| `deletedCount` | number | Number of rows deleted |
-| `deletedRowIds` | array | IDs of deleted rows |
-| `message` | string | Status message |
-
-### `table_get_row`
-
-Get a single row by its ID
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-| `rowId` | string | Yes | Row ID to retrieve |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether row was found |
-| `row` | object | Row data |
-| `message` | string | Status message |
-
-### `table_get_schema`
-
-Get the schema definition for a table
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `tableId` | string | Yes | Table ID |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether schema was retrieved |
-| `name` | string | Table name |
-| `columns` | array | Array of column definitions |
-| `message` | string | Status message |
-
-## Filter Operators
-
-Filters use MongoDB-style operators for flexible querying:
-
-| Operator | Description | Example |
-|----------|-------------|---------|
-| `$eq` | Equals | `{"status": {"$eq": "active"}}` or `{"status": "active"}` |
-| `$ne` | Not equals | `{"status": {"$ne": "deleted"}}` |
-| `$gt` | Greater than | `{"age": {"$gt": 18}}` |
-| `$gte` | Greater than or equal | `{"score": {"$gte": 80}}` |
-| `$lt` | Less than | `{"price": {"$lt": 100}}` |
-| `$lte` | Less than or equal | `{"quantity": {"$lte": 10}}` |
-| `$in` | In array | `{"status": {"$in": ["active", "pending"]}}` |
-| `$nin` | Not in array | `{"type": {"$nin": ["spam", "blocked"]}}` |
-| `$contains` | String contains | `{"email": {"$contains": "@gmail.com"}}` |
-
-### Combining Filters
-
-Multiple field conditions are combined with AND logic:
-
-```json
-{
-  "status": "active",
-  "age": {"$gte": 18}
-}
-```
-
-Use `$or` for OR logic:
-
-```json
-{
-  "$or": [
-    {"status": "active"},
-    {"status": "pending"}
-  ]
-}
-```
-
-## Sort Specification
-
-Specify sort order with column names and direction:
-
-```json
-{
-  "createdAt": "desc"
-}
-```
-
-Multi-column sorting:
-
-```json
-{
-  "priority": "desc",
-  "name": "asc"
-}
-```
-
-## Built-in Columns
-
-Every row automatically includes:
-
-| Column | Type | Description |
-|--------|------|-------------|
-| `id` | string | Unique row identifier |
-| `createdAt` | date | When the row was created |
-| `updatedAt` | date | When the row was last modified |
-
-These can be used in filters and sorting.
-
-## Limits
-
-| Resource | Limit |
-|----------|-------|
-| Tables per workspace | 100 |
-| Rows per table | 10,000 |
-| Columns per table | 50 |
-| Max row size | 100KB |
-| String value length | 10,000 characters |
-| Query limit | 1,000 rows |
-| Batch insert size | 1,000 rows |
-| Bulk update/delete | 1,000 rows |
-
-## Notes
-
-- Category: `blocks`
-- Type: `table`
-- Tables are scoped to workspaces and accessible from any workflow within that workspace
-- Data persists across workflow executions
-- Use unique constraints to enable upsert functionality
-- The visual filter/sort builder provides an easy way to construct queries without writing JSON

apps/sim/app/(auth)/login/login-form.tsx

@@ -24,7 +24,6 @@ import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 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,7 @@ 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')
@@ -124,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)
@@ -141,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(() => {
@@ -203,7 +221,6 @@ export default function LoginPage({
 
     try {
       const safeCallbackUrl = validateCallbackUrl(callbackUrl) ? callbackUrl : '/workspace'
-      let errorHandled = false
 
       const result = await client.signIn.email(
         {
@@ -214,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')
@@ -259,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)
           },
@@ -267,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') {
@@ -402,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`}>

apps/sim/app/(auth)/reset-password/reset-password-form.tsx

@@ -1,13 +1,12 @@
 'use client'
 
-import { useState } from '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 { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
 
 interface RequestResetFormProps {
   email: string
@@ -28,9 +27,36 @@ export function RequestResetForm({
   statusMessage,
   className,
 }: RequestResetFormProps) {
-  const buttonClass = useBrandedButtonClass()
+  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)
@@ -112,9 +138,36 @@ export function SetNewPasswordForm({
   const [validationMessage, setValidationMessage] = useState('')
   const [showPassword, setShowPassword] = useState(false)
   const [showConfirmPassword, setShowConfirmPassword] = useState(false)
-  const buttonClass = useBrandedButtonClass()
+  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()
 

apps/sim/app/(auth)/signup/signup-form.tsx

@@ -16,7 +16,6 @@ import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 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,7 @@ 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('')
@@ -127,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[] => {

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>) => {

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 (
     <>

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) {

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',
+              },
+            },
+          },
         },
       })
 

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()

apps/sim/app/api/table/[tableId]/route.ts

@@ -1,138 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { generateRequestId } from '@/lib/core/utils/request'
-import { deleteTable, type TableSchema } from '@/lib/table'
-import { accessError, checkAccess, normalizeColumn, verifyTableWorkspace } from '../utils'
-
-const logger = createLogger('TableDetailAPI')
-
-const GetTableSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-})
-
-interface TableRouteParams {
-  params: Promise<{ tableId: string }>
-}
-
-/** GET /api/table/[tableId] - Retrieves a single table's details. */
-export async function GET(request: NextRequest, { params }: TableRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      logger.warn(`[${requestId}] Unauthorized table access attempt`)
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const validated = GetTableSchema.parse({
-      workspaceId: searchParams.get('workspaceId'),
-    })
-
-    const result = await checkAccess(tableId, authResult.userId, 'read')
-    if (!result.ok) return accessError(result, requestId, tableId)
-
-    const { table } = result
-
-    const isValidWorkspace = await verifyTableWorkspace(tableId, validated.workspaceId)
-    if (!isValidWorkspace) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    logger.info(`[${requestId}] Retrieved table ${tableId} for user ${authResult.userId}`)
-
-    const schemaData = table.schema as TableSchema
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        table: {
-          id: table.id,
-          name: table.name,
-          description: table.description,
-          schema: {
-            columns: schemaData.columns.map(normalizeColumn),
-          },
-          rowCount: table.rowCount,
-          maxRows: table.maxRows,
-          createdAt:
-            table.createdAt instanceof Date
-              ? table.createdAt.toISOString()
-              : String(table.createdAt),
-          updatedAt:
-            table.updatedAt instanceof Date
-              ? table.updatedAt.toISOString()
-              : String(table.updatedAt),
-        },
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error getting table:`, error)
-    return NextResponse.json({ error: 'Failed to get table' }, { status: 500 })
-  }
-}
-
-/** DELETE /api/table/[tableId] - Deletes a table and all its rows. */
-export async function DELETE(request: NextRequest, { params }: TableRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      logger.warn(`[${requestId}] Unauthorized table delete attempt`)
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const validated = GetTableSchema.parse({
-      workspaceId: searchParams.get('workspaceId'),
-    })
-
-    const result = await checkAccess(tableId, authResult.userId, 'write')
-    if (!result.ok) return accessError(result, requestId, tableId)
-
-    const { table } = result
-
-    const isValidWorkspace = await verifyTableWorkspace(tableId, validated.workspaceId)
-    if (!isValidWorkspace) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    await deleteTable(tableId, requestId)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        message: 'Table deleted successfully',
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error deleting table:`, error)
-    return NextResponse.json({ error: 'Failed to delete table' }, { status: 500 })
-  }
-}

apps/sim/app/api/table/[tableId]/rows/[rowId]/route.ts

@@ -1,276 +0,0 @@
-import { db } from '@sim/db'
-import { userTableRows } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { and, eq } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { generateRequestId } from '@/lib/core/utils/request'
-import type { RowData, TableSchema } from '@/lib/table'
-import { validateRowData } from '@/lib/table'
-import { accessError, checkAccess, verifyTableWorkspace } from '../../../utils'
-
-const logger = createLogger('TableRowAPI')
-
-const GetRowSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-})
-
-const UpdateRowSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  data: z.record(z.unknown(), { required_error: 'Row data is required' }),
-})
-
-const DeleteRowSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-})
-
-interface RowRouteParams {
-  params: Promise<{ tableId: string; rowId: string }>
-}
-
-/** GET /api/table/[tableId]/rows/[rowId] - Retrieves a single row. */
-export async function GET(request: NextRequest, { params }: RowRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId, rowId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const validated = GetRowSchema.parse({
-      workspaceId: searchParams.get('workspaceId'),
-    })
-
-    const result = await checkAccess(tableId, authResult.userId, 'read')
-    if (!result.ok) return accessError(result, requestId, tableId)
-
-    const { table } = result
-
-    const isValidWorkspace = await verifyTableWorkspace(tableId, validated.workspaceId)
-    if (!isValidWorkspace) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const [row] = await db
-      .select({
-        id: userTableRows.id,
-        data: userTableRows.data,
-        createdAt: userTableRows.createdAt,
-        updatedAt: userTableRows.updatedAt,
-      })
-      .from(userTableRows)
-      .where(
-        and(
-          eq(userTableRows.id, rowId),
-          eq(userTableRows.tableId, tableId),
-          eq(userTableRows.workspaceId, validated.workspaceId)
-        )
-      )
-      .limit(1)
-
-    if (!row) {
-      return NextResponse.json({ error: 'Row not found' }, { status: 404 })
-    }
-
-    logger.info(`[${requestId}] Retrieved row ${rowId} from table ${tableId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        row: {
-          id: row.id,
-          data: row.data,
-          createdAt: row.createdAt.toISOString(),
-          updatedAt: row.updatedAt.toISOString(),
-        },
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error getting row:`, error)
-    return NextResponse.json({ error: 'Failed to get row' }, { status: 500 })
-  }
-}
-
-/** PATCH /api/table/[tableId]/rows/[rowId] - Updates a single row (supports partial updates). */
-export async function PATCH(request: NextRequest, { params }: RowRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId, rowId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-    const validated = UpdateRowSchema.parse(body)
-
-    const result = await checkAccess(tableId, authResult.userId, 'write')
-    if (!result.ok) return accessError(result, requestId, tableId)
-
-    const { table } = result
-
-    const isValidWorkspace = await verifyTableWorkspace(tableId, validated.workspaceId)
-    if (!isValidWorkspace) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    // Fetch existing row to support partial updates
-    const [existingRow] = await db
-      .select({ data: userTableRows.data })
-      .from(userTableRows)
-      .where(
-        and(
-          eq(userTableRows.id, rowId),
-          eq(userTableRows.tableId, tableId),
-          eq(userTableRows.workspaceId, validated.workspaceId)
-        )
-      )
-      .limit(1)
-
-    if (!existingRow) {
-      return NextResponse.json({ error: 'Row not found' }, { status: 404 })
-    }
-
-    // Merge existing data with incoming partial data (incoming takes precedence)
-    const mergedData = {
-      ...(existingRow.data as RowData),
-      ...(validated.data as RowData),
-    }
-
-    const validation = await validateRowData({
-      rowData: mergedData,
-      schema: table.schema as TableSchema,
-      tableId,
-      excludeRowId: rowId,
-    })
-    if (!validation.valid) return validation.response
-
-    const now = new Date()
-
-    const [updatedRow] = await db
-      .update(userTableRows)
-      .set({
-        data: mergedData,
-        updatedAt: now,
-      })
-      .where(
-        and(
-          eq(userTableRows.id, rowId),
-          eq(userTableRows.tableId, tableId),
-          eq(userTableRows.workspaceId, validated.workspaceId)
-        )
-      )
-      .returning()
-
-    if (!updatedRow) {
-      return NextResponse.json({ error: 'Row not found' }, { status: 404 })
-    }
-
-    logger.info(`[${requestId}] Updated row ${rowId} in table ${tableId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        row: {
-          id: updatedRow.id,
-          data: updatedRow.data,
-          createdAt: updatedRow.createdAt.toISOString(),
-          updatedAt: updatedRow.updatedAt.toISOString(),
-        },
-        message: 'Row updated successfully',
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error updating row:`, error)
-    return NextResponse.json({ error: 'Failed to update row' }, { status: 500 })
-  }
-}
-
-/** DELETE /api/table/[tableId]/rows/[rowId] - Deletes a single row. */
-export async function DELETE(request: NextRequest, { params }: RowRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId, rowId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-    const validated = DeleteRowSchema.parse(body)
-
-    const result = await checkAccess(tableId, authResult.userId, 'write')
-    if (!result.ok) return accessError(result, requestId, tableId)
-
-    const { table } = result
-
-    const isValidWorkspace = await verifyTableWorkspace(tableId, validated.workspaceId)
-    if (!isValidWorkspace) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const [deletedRow] = await db
-      .delete(userTableRows)
-      .where(
-        and(
-          eq(userTableRows.id, rowId),
-          eq(userTableRows.tableId, tableId),
-          eq(userTableRows.workspaceId, validated.workspaceId)
-        )
-      )
-      .returning()
-
-    if (!deletedRow) {
-      return NextResponse.json({ error: 'Row not found' }, { status: 404 })
-    }
-
-    logger.info(`[${requestId}] Deleted row ${rowId} from table ${tableId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        message: 'Row deleted successfully',
-        deletedCount: 1,
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error deleting row:`, error)
-    return NextResponse.json({ error: 'Failed to delete row' }, { status: 500 })
-  }
-}

apps/sim/app/api/table/[tableId]/rows/route.ts

@@ -1,681 +0,0 @@
-import { db } from '@sim/db'
-import { userTableRows } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { and, eq, sql } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { generateRequestId } from '@/lib/core/utils/request'
-import type { Filter, RowData, Sort, TableSchema } from '@/lib/table'
-import {
-  checkUniqueConstraintsDb,
-  getUniqueColumns,
-  TABLE_LIMITS,
-  USER_TABLE_ROWS_SQL_NAME,
-  validateBatchRows,
-  validateRowAgainstSchema,
-  validateRowData,
-  validateRowSize,
-} from '@/lib/table'
-import { buildFilterClause, buildSortClause } from '@/lib/table/sql'
-import { accessError, checkAccess } from '../../utils'
-
-const logger = createLogger('TableRowsAPI')
-
-const InsertRowSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  data: z.record(z.unknown(), { required_error: 'Row data is required' }),
-})
-
-const BatchInsertRowsSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  rows: z
-    .array(z.record(z.unknown()), { required_error: 'Rows array is required' })
-    .min(1, 'At least one row is required')
-    .max(1000, 'Cannot insert more than 1000 rows per batch'),
-})
-
-const QueryRowsSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  filter: z.record(z.unknown()).optional(),
-  sort: z.record(z.enum(['asc', 'desc'])).optional(),
-  limit: z.coerce
-    .number({ required_error: 'Limit must be a number' })
-    .int('Limit must be an integer')
-    .min(1, 'Limit must be at least 1')
-    .max(TABLE_LIMITS.MAX_QUERY_LIMIT, `Limit cannot exceed ${TABLE_LIMITS.MAX_QUERY_LIMIT}`)
-    .optional()
-    .default(100),
-  offset: z.coerce
-    .number({ required_error: 'Offset must be a number' })
-    .int('Offset must be an integer')
-    .min(0, 'Offset must be 0 or greater')
-    .optional()
-    .default(0),
-})
-
-const UpdateRowsByFilterSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  filter: z.record(z.unknown(), { required_error: 'Filter criteria is required' }),
-  data: z.record(z.unknown(), { required_error: 'Update data is required' }),
-  limit: z.coerce
-    .number({ required_error: 'Limit must be a number' })
-    .int('Limit must be an integer')
-    .min(1, 'Limit must be at least 1')
-    .max(1000, 'Cannot update more than 1000 rows per operation')
-    .optional(),
-})
-
-const DeleteRowsByFilterSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  filter: z.record(z.unknown(), { required_error: 'Filter criteria is required' }),
-  limit: z.coerce
-    .number({ required_error: 'Limit must be a number' })
-    .int('Limit must be an integer')
-    .min(1, 'Limit must be at least 1')
-    .max(1000, 'Cannot delete more than 1000 rows per operation')
-    .optional(),
-})
-
-interface TableRowsRouteParams {
-  params: Promise<{ tableId: string }>
-}
-
-async function handleBatchInsert(
-  requestId: string,
-  tableId: string,
-  body: z.infer<typeof BatchInsertRowsSchema>,
-  userId: string
-): Promise<NextResponse> {
-  const validated = BatchInsertRowsSchema.parse(body)
-
-  const accessResult = await checkAccess(tableId, userId, 'write')
-  if (!accessResult.ok) return accessError(accessResult, requestId, tableId)
-
-  const { table } = accessResult
-
-  if (validated.workspaceId !== table.workspaceId) {
-    logger.warn(
-      `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-    )
-    return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-  }
-
-  const workspaceId = validated.workspaceId
-
-  const remainingCapacity = table.maxRows - table.rowCount
-  if (remainingCapacity < validated.rows.length) {
-    return NextResponse.json(
-      {
-        error: `Insufficient capacity. Can only insert ${remainingCapacity} more rows (table has ${table.rowCount}/${table.maxRows} rows)`,
-      },
-      { status: 400 }
-    )
-  }
-
-  const validation = await validateBatchRows({
-    rows: validated.rows as RowData[],
-    schema: table.schema as TableSchema,
-    tableId,
-  })
-  if (!validation.valid) return validation.response
-
-  const now = new Date()
-  const rowsToInsert = validated.rows.map((data) => ({
-    id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
-    tableId,
-    workspaceId,
-    data,
-    createdAt: now,
-    updatedAt: now,
-    createdBy: userId,
-  }))
-
-  const insertedRows = await db.insert(userTableRows).values(rowsToInsert).returning()
-
-  logger.info(`[${requestId}] Batch inserted ${insertedRows.length} rows into table ${tableId}`)
-
-  return NextResponse.json({
-    success: true,
-    data: {
-      rows: insertedRows.map((r) => ({
-        id: r.id,
-        data: r.data,
-        createdAt: r.createdAt.toISOString(),
-        updatedAt: r.updatedAt.toISOString(),
-      })),
-      insertedCount: insertedRows.length,
-      message: `Successfully inserted ${insertedRows.length} rows`,
-    },
-  })
-}
-
-/** POST /api/table/[tableId]/rows - Inserts row(s). Supports single or batch insert. */
-export async function POST(request: NextRequest, { params }: TableRowsRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-
-    if (
-      typeof body === 'object' &&
-      body !== null &&
-      'rows' in body &&
-      Array.isArray((body as Record<string, unknown>).rows)
-    ) {
-      return handleBatchInsert(
-        requestId,
-        tableId,
-        body as z.infer<typeof BatchInsertRowsSchema>,
-        authResult.userId
-      )
-    }
-
-    const validated = InsertRowSchema.parse(body)
-
-    const accessResult = await checkAccess(tableId, authResult.userId, 'write')
-    if (!accessResult.ok) return accessError(accessResult, requestId, tableId)
-
-    const { table } = accessResult
-
-    if (validated.workspaceId !== table.workspaceId) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const workspaceId = validated.workspaceId
-    const rowData = validated.data as RowData
-
-    const validation = await validateRowData({
-      rowData,
-      schema: table.schema as TableSchema,
-      tableId,
-    })
-    if (!validation.valid) return validation.response
-
-    if (table.rowCount >= table.maxRows) {
-      return NextResponse.json(
-        { error: `Table row limit reached (${table.maxRows} rows max)` },
-        { status: 400 }
-      )
-    }
-
-    const rowId = `row_${crypto.randomUUID().replace(/-/g, '')}`
-    const now = new Date()
-
-    const [row] = await db
-      .insert(userTableRows)
-      .values({
-        id: rowId,
-        tableId,
-        workspaceId,
-        data: validated.data,
-        createdAt: now,
-        updatedAt: now,
-        createdBy: authResult.userId,
-      })
-      .returning()
-
-    logger.info(`[${requestId}] Inserted row ${rowId} into table ${tableId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        row: {
-          id: row.id,
-          data: row.data,
-          createdAt: row.createdAt.toISOString(),
-          updatedAt: row.updatedAt.toISOString(),
-        },
-        message: 'Row inserted successfully',
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error inserting row:`, error)
-    return NextResponse.json({ error: 'Failed to insert row' }, { status: 500 })
-  }
-}
-
-/** GET /api/table/[tableId]/rows - Queries rows with filtering, sorting, and pagination. */
-export async function GET(request: NextRequest, { params }: TableRowsRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const workspaceId = searchParams.get('workspaceId')
-    const filterParam = searchParams.get('filter')
-    const sortParam = searchParams.get('sort')
-    const limit = searchParams.get('limit')
-    const offset = searchParams.get('offset')
-
-    let filter: Record<string, unknown> | undefined
-    let sort: Sort | undefined
-
-    try {
-      if (filterParam) {
-        filter = JSON.parse(filterParam) as Record<string, unknown>
-      }
-      if (sortParam) {
-        sort = JSON.parse(sortParam) as Sort
-      }
-    } catch {
-      return NextResponse.json({ error: 'Invalid filter or sort JSON' }, { status: 400 })
-    }
-
-    const validated = QueryRowsSchema.parse({
-      workspaceId,
-      filter,
-      sort,
-      limit,
-      offset,
-    })
-
-    const accessResult = await checkAccess(tableId, authResult.userId, 'read')
-    if (!accessResult.ok) return accessError(accessResult, requestId, tableId)
-
-    const { table } = accessResult
-
-    if (validated.workspaceId !== table.workspaceId) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const baseConditions = [
-      eq(userTableRows.tableId, tableId),
-      eq(userTableRows.workspaceId, validated.workspaceId),
-    ]
-
-    if (validated.filter) {
-      const filterClause = buildFilterClause(validated.filter as Filter, USER_TABLE_ROWS_SQL_NAME)
-      if (filterClause) {
-        baseConditions.push(filterClause)
-      }
-    }
-
-    let query = db
-      .select({
-        id: userTableRows.id,
-        data: userTableRows.data,
-        createdAt: userTableRows.createdAt,
-        updatedAt: userTableRows.updatedAt,
-      })
-      .from(userTableRows)
-      .where(and(...baseConditions))
-
-    if (validated.sort) {
-      const schema = table.schema as TableSchema
-      const sortClause = buildSortClause(validated.sort, USER_TABLE_ROWS_SQL_NAME, schema.columns)
-      if (sortClause) {
-        query = query.orderBy(sortClause) as typeof query
-      }
-    } else {
-      query = query.orderBy(userTableRows.createdAt) as typeof query
-    }
-
-    const countQuery = db
-      .select({ count: sql<number>`count(*)` })
-      .from(userTableRows)
-      .where(and(...baseConditions))
-
-    const [{ count: totalCount }] = await countQuery
-
-    const rows = await query.limit(validated.limit).offset(validated.offset)
-
-    logger.info(
-      `[${requestId}] Queried ${rows.length} rows from table ${tableId} (total: ${totalCount})`
-    )
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        rows: rows.map((r) => ({
-          id: r.id,
-          data: r.data,
-          createdAt: r.createdAt.toISOString(),
-          updatedAt: r.updatedAt.toISOString(),
-        })),
-        rowCount: rows.length,
-        totalCount: Number(totalCount),
-        limit: validated.limit,
-        offset: validated.offset,
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error querying rows:`, error)
-    return NextResponse.json({ error: 'Failed to query rows' }, { status: 500 })
-  }
-}
-
-/** PUT /api/table/[tableId]/rows - Updates rows matching filter criteria. */
-export async function PUT(request: NextRequest, { params }: TableRowsRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-    const validated = UpdateRowsByFilterSchema.parse(body)
-
-    const accessResult = await checkAccess(tableId, authResult.userId, 'write')
-    if (!accessResult.ok) return accessError(accessResult, requestId, tableId)
-
-    const { table } = accessResult
-
-    if (validated.workspaceId !== table.workspaceId) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const updateData = validated.data as RowData
-
-    const sizeValidation = validateRowSize(updateData)
-    if (!sizeValidation.valid) {
-      return NextResponse.json(
-        { error: 'Invalid row data', details: sizeValidation.errors },
-        { status: 400 }
-      )
-    }
-
-    const baseConditions = [
-      eq(userTableRows.tableId, tableId),
-      eq(userTableRows.workspaceId, validated.workspaceId),
-    ]
-
-    const filterClause = buildFilterClause(validated.filter as Filter, USER_TABLE_ROWS_SQL_NAME)
-    if (filterClause) {
-      baseConditions.push(filterClause)
-    }
-
-    let matchingRowsQuery = db
-      .select({
-        id: userTableRows.id,
-        data: userTableRows.data,
-      })
-      .from(userTableRows)
-      .where(and(...baseConditions))
-
-    if (validated.limit) {
-      matchingRowsQuery = matchingRowsQuery.limit(validated.limit) as typeof matchingRowsQuery
-    }
-
-    const matchingRows = await matchingRowsQuery
-
-    if (matchingRows.length === 0) {
-      return NextResponse.json(
-        {
-          success: true,
-          data: {
-            message: 'No rows matched the filter criteria',
-            updatedCount: 0,
-          },
-        },
-        { status: 200 }
-      )
-    }
-
-    if (matchingRows.length > TABLE_LIMITS.MAX_BULK_OPERATION_SIZE) {
-      logger.warn(`[${requestId}] Updating ${matchingRows.length} rows. This may take some time.`)
-    }
-
-    for (const row of matchingRows) {
-      const existingData = row.data as RowData
-      const mergedData = { ...existingData, ...updateData }
-      const rowValidation = validateRowAgainstSchema(mergedData, table.schema as TableSchema)
-      if (!rowValidation.valid) {
-        return NextResponse.json(
-          {
-            error: 'Updated data does not match schema',
-            details: rowValidation.errors,
-            affectedRowId: row.id,
-          },
-          { status: 400 }
-        )
-      }
-    }
-
-    const uniqueColumns = getUniqueColumns(table.schema as TableSchema)
-    if (uniqueColumns.length > 0) {
-      // If updating multiple rows, check that updateData doesn't set any unique column
-      // (would cause all rows to have the same value, violating uniqueness)
-      if (matchingRows.length > 1) {
-        const uniqueColumnsInUpdate = uniqueColumns.filter((col) => col.name in updateData)
-        if (uniqueColumnsInUpdate.length > 0) {
-          return NextResponse.json(
-            {
-              error: 'Cannot set unique column values when updating multiple rows',
-              details: [
-                `Columns with unique constraint: ${uniqueColumnsInUpdate.map((c) => c.name).join(', ')}. ` +
-                  `Updating ${matchingRows.length} rows with the same value would violate uniqueness.`,
-              ],
-            },
-            { status: 400 }
-          )
-        }
-      }
-
-      // Check unique constraints against database for each row
-      for (const row of matchingRows) {
-        const existingData = row.data as RowData
-        const mergedData = { ...existingData, ...updateData }
-        const uniqueValidation = await checkUniqueConstraintsDb(
-          tableId,
-          mergedData,
-          table.schema as TableSchema,
-          row.id
-        )
-
-        if (!uniqueValidation.valid) {
-          return NextResponse.json(
-            {
-              error: 'Unique constraint violation',
-              details: uniqueValidation.errors,
-              affectedRowId: row.id,
-            },
-            { status: 400 }
-          )
-        }
-      }
-    }
-
-    const now = new Date()
-
-    await db.transaction(async (trx) => {
-      let totalUpdated = 0
-
-      for (let i = 0; i < matchingRows.length; i += TABLE_LIMITS.UPDATE_BATCH_SIZE) {
-        const batch = matchingRows.slice(i, i + TABLE_LIMITS.UPDATE_BATCH_SIZE)
-        const updatePromises = batch.map((row) => {
-          const existingData = row.data as RowData
-          return trx
-            .update(userTableRows)
-            .set({
-              data: { ...existingData, ...updateData },
-              updatedAt: now,
-            })
-            .where(eq(userTableRows.id, row.id))
-        })
-        await Promise.all(updatePromises)
-        totalUpdated += batch.length
-        logger.info(
-          `[${requestId}] Updated batch ${Math.floor(i / TABLE_LIMITS.UPDATE_BATCH_SIZE) + 1} (${totalUpdated}/${matchingRows.length} rows)`
-        )
-      }
-    })
-
-    logger.info(`[${requestId}] Updated ${matchingRows.length} rows in table ${tableId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        message: 'Rows updated successfully',
-        updatedCount: matchingRows.length,
-        updatedRowIds: matchingRows.map((r) => r.id),
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error updating rows by filter:`, error)
-
-    const errorMessage = error instanceof Error ? error.message : String(error)
-    const detailedError = `Failed to update rows: ${errorMessage}`
-
-    return NextResponse.json({ error: detailedError }, { status: 500 })
-  }
-}
-
-/** DELETE /api/table/[tableId]/rows - Deletes rows matching filter criteria. */
-export async function DELETE(request: NextRequest, { params }: TableRowsRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-    const validated = DeleteRowsByFilterSchema.parse(body)
-
-    const accessResult = await checkAccess(tableId, authResult.userId, 'write')
-    if (!accessResult.ok) return accessError(accessResult, requestId, tableId)
-
-    const { table } = accessResult
-
-    if (validated.workspaceId !== table.workspaceId) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const baseConditions = [
-      eq(userTableRows.tableId, tableId),
-      eq(userTableRows.workspaceId, validated.workspaceId),
-    ]
-
-    const filterClause = buildFilterClause(validated.filter as Filter, USER_TABLE_ROWS_SQL_NAME)
-    if (filterClause) {
-      baseConditions.push(filterClause)
-    }
-
-    let matchingRowsQuery = db
-      .select({ id: userTableRows.id })
-      .from(userTableRows)
-      .where(and(...baseConditions))
-
-    if (validated.limit) {
-      matchingRowsQuery = matchingRowsQuery.limit(validated.limit) as typeof matchingRowsQuery
-    }
-
-    const matchingRows = await matchingRowsQuery
-
-    if (matchingRows.length === 0) {
-      return NextResponse.json(
-        {
-          success: true,
-          data: {
-            message: 'No rows matched the filter criteria',
-            deletedCount: 0,
-          },
-        },
-        { status: 200 }
-      )
-    }
-
-    if (matchingRows.length > TABLE_LIMITS.DELETE_BATCH_SIZE) {
-      logger.warn(`[${requestId}] Deleting ${matchingRows.length} rows. This may take some time.`)
-    }
-
-    const rowIds = matchingRows.map((r) => r.id)
-
-    await db.transaction(async (trx) => {
-      let totalDeleted = 0
-
-      for (let i = 0; i < rowIds.length; i += TABLE_LIMITS.DELETE_BATCH_SIZE) {
-        const batch = rowIds.slice(i, i + TABLE_LIMITS.DELETE_BATCH_SIZE)
-        await trx.delete(userTableRows).where(
-          and(
-            eq(userTableRows.tableId, tableId),
-            eq(userTableRows.workspaceId, validated.workspaceId),
-            sql`${userTableRows.id} = ANY(ARRAY[${sql.join(
-              batch.map((id) => sql`${id}`),
-              sql`, `
-            )}])`
-          )
-        )
-        totalDeleted += batch.length
-        logger.info(
-          `[${requestId}] Deleted batch ${Math.floor(i / TABLE_LIMITS.DELETE_BATCH_SIZE) + 1} (${totalDeleted}/${rowIds.length} rows)`
-        )
-      }
-    })
-
-    logger.info(`[${requestId}] Deleted ${matchingRows.length} rows from table ${tableId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        message: 'Rows deleted successfully',
-        deletedCount: matchingRows.length,
-        deletedRowIds: rowIds,
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error deleting rows by filter:`, error)
-
-    const errorMessage = error instanceof Error ? error.message : String(error)
-    const detailedError = `Failed to delete rows: ${errorMessage}`
-
-    return NextResponse.json({ error: detailedError }, { status: 500 })
-  }
-}

apps/sim/app/api/table/[tableId]/rows/upsert/route.ts

@@ -1,182 +0,0 @@
-import { db } from '@sim/db'
-import { userTableRows } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { and, eq, or, sql } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { generateRequestId } from '@/lib/core/utils/request'
-import type { RowData, TableSchema } from '@/lib/table'
-import { getUniqueColumns, validateRowData } from '@/lib/table'
-import { accessError, checkAccess, verifyTableWorkspace } from '../../../utils'
-
-const logger = createLogger('TableUpsertAPI')
-
-const UpsertRowSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-  data: z.record(z.unknown(), { required_error: 'Row data is required' }),
-})
-
-interface UpsertRouteParams {
-  params: Promise<{ tableId: string }>
-}
-
-/** POST /api/table/[tableId]/rows/upsert - Inserts or updates based on unique columns. */
-export async function POST(request: NextRequest, { params }: UpsertRouteParams) {
-  const requestId = generateRequestId()
-  const { tableId } = await params
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-    const validated = UpsertRowSchema.parse(body)
-
-    const result = await checkAccess(tableId, authResult.userId, 'write')
-    if (!result.ok) return accessError(result, requestId, tableId)
-
-    const { table } = result
-
-    const isValidWorkspace = await verifyTableWorkspace(tableId, validated.workspaceId)
-    if (!isValidWorkspace) {
-      logger.warn(
-        `[${requestId}] Workspace ID mismatch for table ${tableId}. Provided: ${validated.workspaceId}, Actual: ${table.workspaceId}`
-      )
-      return NextResponse.json({ error: 'Invalid workspace ID' }, { status: 400 })
-    }
-
-    const schema = table.schema as TableSchema
-    const rowData = validated.data as RowData
-
-    const validation = await validateRowData({
-      rowData,
-      schema,
-      tableId,
-      checkUnique: false,
-    })
-    if (!validation.valid) return validation.response
-
-    const uniqueColumns = getUniqueColumns(schema)
-
-    if (uniqueColumns.length === 0) {
-      return NextResponse.json(
-        {
-          error:
-            'Upsert requires at least one unique column in the schema. Please add a unique constraint to a column or use insert instead.',
-        },
-        { status: 400 }
-      )
-    }
-
-    const uniqueFilters = uniqueColumns.map((col) => {
-      const value = rowData[col.name]
-      if (value === undefined || value === null) {
-        return null
-      }
-      return sql`${userTableRows.data}->>${col.name} = ${String(value)}`
-    })
-
-    const validUniqueFilters = uniqueFilters.filter((f): f is Exclude<typeof f, null> => f !== null)
-
-    if (validUniqueFilters.length === 0) {
-      return NextResponse.json(
-        {
-          error: `Upsert requires values for at least one unique field: ${uniqueColumns.map((c) => c.name).join(', ')}`,
-        },
-        { status: 400 }
-      )
-    }
-
-    const [existingRow] = await db
-      .select()
-      .from(userTableRows)
-      .where(
-        and(
-          eq(userTableRows.tableId, tableId),
-          eq(userTableRows.workspaceId, validated.workspaceId),
-          or(...validUniqueFilters)
-        )
-      )
-      .limit(1)
-
-    const now = new Date()
-
-    if (!existingRow && table.rowCount >= table.maxRows) {
-      return NextResponse.json(
-        { error: `Table row limit reached (${table.maxRows} rows max)` },
-        { status: 400 }
-      )
-    }
-
-    const upsertResult = await db.transaction(async (trx) => {
-      if (existingRow) {
-        const [updatedRow] = await trx
-          .update(userTableRows)
-          .set({
-            data: validated.data,
-            updatedAt: now,
-          })
-          .where(eq(userTableRows.id, existingRow.id))
-          .returning()
-
-        return {
-          row: updatedRow,
-          operation: 'update' as const,
-        }
-      }
-
-      const [insertedRow] = await trx
-        .insert(userTableRows)
-        .values({
-          id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
-          tableId,
-          workspaceId: validated.workspaceId,
-          data: validated.data,
-          createdAt: now,
-          updatedAt: now,
-          createdBy: authResult.userId,
-        })
-        .returning()
-
-      return {
-        row: insertedRow,
-        operation: 'insert' as const,
-      }
-    })
-
-    logger.info(
-      `[${requestId}] Upserted (${upsertResult.operation}) row ${upsertResult.row.id} in table ${tableId}`
-    )
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        row: {
-          id: upsertResult.row.id,
-          data: upsertResult.row.data,
-          createdAt: upsertResult.row.createdAt.toISOString(),
-          updatedAt: upsertResult.row.updatedAt.toISOString(),
-        },
-        operation: upsertResult.operation,
-        message: `Row ${upsertResult.operation === 'update' ? 'updated' : 'inserted'} successfully`,
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error upserting row:`, error)
-
-    const errorMessage = error instanceof Error ? error.message : String(error)
-    const detailedError = `Failed to upsert row: ${errorMessage}`
-
-    return NextResponse.json({ error: detailedError }, { status: 500 })
-  }
-}

apps/sim/app/api/table/route.ts

@@ -1,293 +0,0 @@
-import { db } from '@sim/db'
-import { permissions, workspace } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { and, eq } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
-import { generateRequestId } from '@/lib/core/utils/request'
-import {
-  canCreateTable,
-  createTable,
-  getWorkspaceTableLimits,
-  listTables,
-  TABLE_LIMITS,
-  type TableSchema,
-} from '@/lib/table'
-import { normalizeColumn } from './utils'
-
-const logger = createLogger('TableAPI')
-
-const ColumnSchema = z.object({
-  name: z
-    .string()
-    .min(1, 'Column name is required')
-    .max(
-      TABLE_LIMITS.MAX_COLUMN_NAME_LENGTH,
-      `Column name must be ${TABLE_LIMITS.MAX_COLUMN_NAME_LENGTH} characters or less`
-    )
-    .regex(
-      /^[a-z_][a-z0-9_]*$/i,
-      'Column name must start with a letter or underscore and contain only alphanumeric characters and underscores'
-    ),
-  type: z.enum(['string', 'number', 'boolean', 'date', 'json'], {
-    errorMap: () => ({
-      message: 'Column type must be one of: string, number, boolean, date, json',
-    }),
-  }),
-  required: z.boolean().optional().default(false),
-  unique: z.boolean().optional().default(false),
-})
-
-const CreateTableSchema = z.object({
-  name: z
-    .string()
-    .min(1, 'Table name is required')
-    .max(
-      TABLE_LIMITS.MAX_TABLE_NAME_LENGTH,
-      `Table name must be ${TABLE_LIMITS.MAX_TABLE_NAME_LENGTH} characters or less`
-    )
-    .regex(
-      /^[a-z_][a-z0-9_]*$/i,
-      'Table name must start with a letter or underscore and contain only alphanumeric characters and underscores'
-    ),
-  description: z
-    .string()
-    .max(
-      TABLE_LIMITS.MAX_DESCRIPTION_LENGTH,
-      `Description must be ${TABLE_LIMITS.MAX_DESCRIPTION_LENGTH} characters or less`
-    )
-    .optional(),
-  schema: z.object({
-    columns: z
-      .array(ColumnSchema)
-      .min(1, 'Table must have at least one column')
-      .max(
-        TABLE_LIMITS.MAX_COLUMNS_PER_TABLE,
-        `Table cannot have more than ${TABLE_LIMITS.MAX_COLUMNS_PER_TABLE} columns`
-      ),
-  }),
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-})
-
-const ListTablesSchema = z.object({
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
-})
-
-interface WorkspaceAccessResult {
-  hasAccess: boolean
-  canWrite: boolean
-}
-
-async function checkWorkspaceAccess(
-  workspaceId: string,
-  userId: string
-): Promise<WorkspaceAccessResult> {
-  const [workspaceData] = await db
-    .select({
-      id: workspace.id,
-      ownerId: workspace.ownerId,
-    })
-    .from(workspace)
-    .where(eq(workspace.id, workspaceId))
-    .limit(1)
-
-  if (!workspaceData) {
-    return { hasAccess: false, canWrite: false }
-  }
-
-  if (workspaceData.ownerId === userId) {
-    return { hasAccess: true, canWrite: true }
-  }
-
-  const [permission] = await db
-    .select({
-      permissionType: permissions.permissionType,
-    })
-    .from(permissions)
-    .where(
-      and(
-        eq(permissions.userId, userId),
-        eq(permissions.entityType, 'workspace'),
-        eq(permissions.entityId, workspaceId)
-      )
-    )
-    .limit(1)
-
-  if (!permission) {
-    return { hasAccess: false, canWrite: false }
-  }
-
-  const canWrite = permission.permissionType === 'admin' || permission.permissionType === 'write'
-
-  return {
-    hasAccess: true,
-    canWrite,
-  }
-}
-
-/** POST /api/table - Creates a new user-defined table. */
-export async function POST(request: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const body: unknown = await request.json()
-    const params = CreateTableSchema.parse(body)
-
-    const { hasAccess, canWrite } = await checkWorkspaceAccess(
-      params.workspaceId,
-      authResult.userId
-    )
-
-    if (!hasAccess || !canWrite) {
-      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
-    }
-
-    // Check billing plan limits
-    const existingTables = await listTables(params.workspaceId)
-    const { canCreate, maxTables } = await canCreateTable(params.workspaceId, existingTables.length)
-
-    if (!canCreate) {
-      return NextResponse.json(
-        {
-          error: `Workspace has reached the maximum table limit (${maxTables}) for your plan. Please upgrade to create more tables.`,
-        },
-        { status: 403 }
-      )
-    }
-
-    // Get plan-based row limits
-    const planLimits = await getWorkspaceTableLimits(params.workspaceId)
-    const maxRowsPerTable = planLimits.maxRowsPerTable
-
-    const normalizedSchema: TableSchema = {
-      columns: params.schema.columns.map(normalizeColumn),
-    }
-
-    const table = await createTable(
-      {
-        name: params.name,
-        description: params.description,
-        schema: normalizedSchema,
-        workspaceId: params.workspaceId,
-        userId: authResult.userId,
-        maxRows: maxRowsPerTable,
-      },
-      requestId
-    )
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        table: {
-          id: table.id,
-          name: table.name,
-          description: table.description,
-          schema: table.schema,
-          rowCount: table.rowCount,
-          maxRows: table.maxRows,
-          createdAt:
-            table.createdAt instanceof Date
-              ? table.createdAt.toISOString()
-              : String(table.createdAt),
-          updatedAt:
-            table.updatedAt instanceof Date
-              ? table.updatedAt.toISOString()
-              : String(table.updatedAt),
-        },
-        message: 'Table created successfully',
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    if (error instanceof Error) {
-      if (
-        error.message.includes('Invalid table name') ||
-        error.message.includes('Invalid schema') ||
-        error.message.includes('already exists') ||
-        error.message.includes('maximum table limit')
-      ) {
-        return NextResponse.json({ error: error.message }, { status: 400 })
-      }
-    }
-
-    logger.error(`[${requestId}] Error creating table:`, error)
-    return NextResponse.json({ error: 'Failed to create table' }, { status: 500 })
-  }
-}
-
-/** GET /api/table - Lists all tables in a workspace. */
-export async function GET(request: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const authResult = await checkHybridAuth(request)
-    if (!authResult.success || !authResult.userId) {
-      return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const workspaceId = searchParams.get('workspaceId')
-
-    const validation = ListTablesSchema.safeParse({ workspaceId })
-    if (!validation.success) {
-      return NextResponse.json(
-        { error: 'Validation error', details: validation.error.errors },
-        { status: 400 }
-      )
-    }
-
-    const params = validation.data
-
-    const { hasAccess } = await checkWorkspaceAccess(params.workspaceId, authResult.userId)
-
-    if (!hasAccess) {
-      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
-    }
-
-    const tables = await listTables(params.workspaceId)
-
-    logger.info(`[${requestId}] Listed ${tables.length} tables in workspace ${params.workspaceId}`)
-
-    return NextResponse.json({
-      success: true,
-      data: {
-        tables: tables.map((t) => {
-          const schemaData = t.schema as TableSchema
-          return {
-            ...t,
-            schema: {
-              columns: schemaData.columns.map(normalizeColumn),
-            },
-            createdAt:
-              t.createdAt instanceof Date ? t.createdAt.toISOString() : String(t.createdAt),
-            updatedAt:
-              t.updatedAt instanceof Date ? t.updatedAt.toISOString() : String(t.updatedAt),
-          }
-        }),
-        totalCount: tables.length,
-      },
-    })
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json(
-        { error: 'Validation error', details: error.errors },
-        { status: 400 }
-      )
-    }
-
-    logger.error(`[${requestId}] Error listing tables:`, error)
-    return NextResponse.json({ error: 'Failed to list tables' }, { status: 500 })
-  }
-}

apps/sim/app/api/table/utils.ts

@@ -1,188 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { NextResponse } from 'next/server'
-import type { ColumnDefinition, TableDefinition } from '@/lib/table'
-import { getTableById } from '@/lib/table'
-import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
-
-const logger = createLogger('TableUtils')
-
-export interface TableAccessResult {
-  hasAccess: true
-  table: TableDefinition
-}
-
-export interface TableAccessDenied {
-  hasAccess: false
-  notFound?: boolean
-  reason?: string
-}
-
-export type TableAccessCheck = TableAccessResult | TableAccessDenied
-
-export type AccessResult = { ok: true; table: TableDefinition } | { ok: false; status: 404 | 403 }
-
-export interface ApiErrorResponse {
-  error: string
-  details?: unknown
-}
-
-/**
- * Check if a user has read access to a table.
- * Read access is granted if:
- * 1. User created the table, OR
- * 2. User has any permission on the table's workspace (read, write, or admin)
- *
- * Follows the same pattern as Knowledge Base access checks.
- */
-export async function checkTableAccess(tableId: string, userId: string): Promise<TableAccessCheck> {
-  const table = await getTableById(tableId)
-
-  if (!table) {
-    return { hasAccess: false, notFound: true }
-  }
-
-  // Case 1: User created the table
-  if (table.createdBy === userId) {
-    return { hasAccess: true, table }
-  }
-
-  // Case 2: Table belongs to a workspace the user has permissions for
-  const userPermission = await getUserEntityPermissions(userId, 'workspace', table.workspaceId)
-  if (userPermission !== null) {
-    return { hasAccess: true, table }
-  }
-
-  return { hasAccess: false, reason: 'User does not have access to this table' }
-}
-
-/**
- * Check if a user has write access to a table.
- * Write access is granted if:
- * 1. User created the table, OR
- * 2. User has write or admin permissions on the table's workspace
- *
- * Follows the same pattern as Knowledge Base write access checks.
- */
-export async function checkTableWriteAccess(
-  tableId: string,
-  userId: string
-): Promise<TableAccessCheck> {
-  const table = await getTableById(tableId)
-
-  if (!table) {
-    return { hasAccess: false, notFound: true }
-  }
-
-  // Case 1: User created the table
-  if (table.createdBy === userId) {
-    return { hasAccess: true, table }
-  }
-
-  // Case 2: Table belongs to a workspace and user has write/admin permissions
-  const userPermission = await getUserEntityPermissions(userId, 'workspace', table.workspaceId)
-  if (userPermission === 'write' || userPermission === 'admin') {
-    return { hasAccess: true, table }
-  }
-
-  return { hasAccess: false, reason: 'User does not have write access to this table' }
-}
-
-/**
- * @deprecated Use checkTableAccess or checkTableWriteAccess instead.
- * Legacy access check function for backwards compatibility.
- */
-export async function checkAccess(
-  tableId: string,
-  userId: string,
-  level: 'read' | 'write' | 'admin' = 'read'
-): Promise<AccessResult> {
-  const table = await getTableById(tableId)
-
-  if (!table) {
-    return { ok: false, status: 404 }
-  }
-
-  if (table.createdBy === userId) {
-    return { ok: true, table }
-  }
-
-  const permission = await getUserEntityPermissions(userId, 'workspace', table.workspaceId)
-  const hasAccess =
-    permission !== null &&
-    (level === 'read' ||
-      (level === 'write' && (permission === 'write' || permission === 'admin')) ||
-      (level === 'admin' && permission === 'admin'))
-
-  return hasAccess ? { ok: true, table } : { ok: false, status: 403 }
-}
-
-export function accessError(
-  result: { ok: false; status: 404 | 403 },
-  requestId: string,
-  context?: string
-): NextResponse {
-  const message = result.status === 404 ? 'Table not found' : 'Access denied'
-  logger.warn(`[${requestId}] ${message}${context ? `: ${context}` : ''}`)
-  return NextResponse.json({ error: message }, { status: result.status })
-}
-
-/**
- * Converts a TableAccessDenied result to an appropriate HTTP response.
- * Use with checkTableAccess or checkTableWriteAccess.
- */
-export function tableAccessError(
-  result: TableAccessDenied,
-  requestId: string,
-  context?: string
-): NextResponse {
-  const status = result.notFound ? 404 : 403
-  const message = result.notFound ? 'Table not found' : (result.reason ?? 'Access denied')
-  logger.warn(`[${requestId}] ${message}${context ? `: ${context}` : ''}`)
-  return NextResponse.json({ error: message }, { status })
-}
-
-export async function verifyTableWorkspace(tableId: string, workspaceId: string): Promise<boolean> {
-  const table = await getTableById(tableId)
-  return table?.workspaceId === workspaceId
-}
-
-export function errorResponse(
-  message: string,
-  status: number,
-  details?: unknown
-): NextResponse<ApiErrorResponse> {
-  const body: ApiErrorResponse = { error: message }
-  if (details !== undefined) {
-    body.details = details
-  }
-  return NextResponse.json(body, { status })
-}
-
-export function badRequestResponse(message: string, details?: unknown) {
-  return errorResponse(message, 400, details)
-}
-
-export function unauthorizedResponse(message = 'Authentication required') {
-  return errorResponse(message, 401)
-}
-
-export function forbiddenResponse(message = 'Access denied') {
-  return errorResponse(message, 403)
-}
-
-export function notFoundResponse(message = 'Resource not found') {
-  return errorResponse(message, 404)
-}
-
-export function serverErrorResponse(message = 'Internal server error') {
-  return errorResponse(message, 500)
-}
-
-export function normalizeColumn(col: ColumnDefinition): ColumnDefinition {
-  return {
-    name: col.name,
-    type: col.type,
-    required: col.required ?? false,
-    unique: col.unique ?? false,
-  }
-}

apps/sim/app/api/wand/route.ts

@@ -11,7 +11,6 @@ import { checkAndBillOverageThreshold } from '@/lib/billing/threshold-billing'
 import { env } from '@/lib/core/config/env'
 import { getCostMultiplier, isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { generateRequestId } from '@/lib/core/utils/request'
-import { enrichTableSchema } from '@/lib/table/llm/wand'
 import { verifyWorkspaceMembership } from '@/app/api/workflows/utils'
 import { getModelPricing } from '@/providers/utils'
 
@@ -61,7 +60,6 @@ interface RequestBody {
   history?: ChatMessage[]
   workflowId?: string
   generationType?: string
-  wandContext?: Record<string, unknown>
 }
 
 function safeStringify(value: unknown): string {
@@ -72,38 +70,6 @@ function safeStringify(value: unknown): string {
   }
 }
 
-/**
- * Wand enricher function type.
- * Enrichers add context to the system prompt based on generationType.
- */
-type WandEnricher = (
-  workspaceId: string | null,
-  context: Record<string, unknown>
-) => Promise<string | null>
-
-/**
- * Registry of wand enrichers by generationType.
- * Each enricher returns additional context to append to the system prompt.
- */
-const wandEnrichers: Partial<Record<string, WandEnricher>> = {
-  timestamp: async () => {
-    const now = new Date()
-    return `Current date and time context for reference:
-- Current UTC timestamp: ${now.toISOString()}
-- Current Unix timestamp (seconds): ${Math.floor(now.getTime() / 1000)}
-- Current Unix timestamp (milliseconds): ${now.getTime()}
-- Current date (UTC): ${now.toISOString().split('T')[0]}
-- Current year: ${now.getUTCFullYear()}
-- Current month: ${now.getUTCMonth() + 1}
-- Current day of month: ${now.getUTCDate()}
-- Current day of week: ${['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][now.getUTCDay()]}
-
-Use this context to calculate relative dates like "yesterday", "last week", "beginning of this month", etc.`
-  },
-
-  'table-schema': enrichTableSchema,
-}
-
 async function updateUserStatsForWand(
   userId: string,
   usage: {
@@ -193,15 +159,7 @@ export async function POST(req: NextRequest) {
   try {
     const body = (await req.json()) as RequestBody
 
-    const {
-      prompt,
-      systemPrompt,
-      stream = false,
-      history = [],
-      workflowId,
-      generationType,
-      wandContext = {},
-    } = body
+    const { prompt, systemPrompt, stream = false, history = [], workflowId, generationType } = body
 
     if (!prompt) {
       logger.warn(`[${requestId}] Invalid request: Missing prompt.`)
@@ -269,15 +227,20 @@ export async function POST(req: NextRequest) {
       systemPrompt ||
       'You are a helpful AI assistant. Generate content exactly as requested by the user.'
 
-    // Apply enricher if one exists for this generationType
-    if (generationType) {
-      const enricher = wandEnrichers[generationType]
-      if (enricher) {
-        const enrichment = await enricher(workspaceId, wandContext)
-        if (enrichment) {
-          finalSystemPrompt += `\n\n${enrichment}`
-        }
-      }
+    if (generationType === 'timestamp') {
+      const now = new Date()
+      const currentTimeContext = `\n\nCurrent date and time context for reference:
+- Current UTC timestamp: ${now.toISOString()}
+- Current Unix timestamp (seconds): ${Math.floor(now.getTime() / 1000)}
+- Current Unix timestamp (milliseconds): ${now.getTime()}
+- Current date (UTC): ${now.toISOString().split('T')[0]}
+- Current year: ${now.getUTCFullYear()}
+- Current month: ${now.getUTCMonth() + 1}
+- Current day of month: ${now.getUTCDate()}
+- Current day of week: ${['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][now.getUTCDay()]}
+
+Use this context to calculate relative dates like "yesterday", "last week", "beginning of this month", etc.`
+      finalSystemPrompt += currentTimeContext
     }
 
     if (generationType === 'json-object') {

apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/document-tags-modal/document-tags-modal.tsx

@@ -555,7 +555,7 @@ export function DocumentTagsModal({
                           Cancel
                         </Button>
                         <Button
-                          variant={canSaveTag ? 'tertiary' : 'default'}
+                          variant='tertiary'
                           onClick={saveDocumentTag}
                           className='flex-1'
                           disabled={!canSaveTag}

apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/edit-chunk-modal/edit-chunk-modal.tsx

@@ -300,7 +300,7 @@ export function EditChunkModal({
               </Button>
               {userPermissions.canEdit && (
                 <Button
-                  variant={hasUnsavedChanges ? 'tertiary' : 'default'}
+                  variant='tertiary'
                   onClick={handleSaveContent}
                   type='button'
                   disabled={!isFormValid || isSaving || !hasUnsavedChanges || isNavigating}

apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/rename-document-modal/rename-document-modal.tsx

@@ -39,9 +39,6 @@ export function RenameDocumentModal({
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [error, setError] = useState<string | null>(null)
 
-  // Check if name has changed from initial value
-  const hasChanges = name.trim() !== initialName.trim()
-
   useEffect(() => {
     if (open) {
       setName(initialName)
@@ -126,11 +123,7 @@ export function RenameDocumentModal({
                 >
                   Cancel
                 </Button>
-                <Button
-                  variant={hasChanges ? 'tertiary' : 'default'}
-                  type='submit'
-                  disabled={isSubmitting || !name?.trim() || !hasChanges}
-                >
+                <Button variant='tertiary' type='submit' disabled={isSubmitting || !name?.trim()}>
                   {isSubmitting ? 'Renaming...' : 'Rename'}
                 </Button>
               </div>

apps/sim/app/workspace/[workspaceId]/knowledge/components/base-card/base-card.tsx

@@ -1,8 +1,8 @@
 'use client'
 
-import { useCallback, useRef, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useParams, useRouter } from 'next/navigation'
-import { Badge, Button, DocumentAttachment, Tooltip } from '@/components/emcn'
+import { Badge, DocumentAttachment, Tooltip } from '@/components/emcn'
 import { BaseTagsModal } from '@/app/workspace/[workspaceId]/knowledge/[id]/components'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
@@ -143,7 +143,6 @@ export function BaseCard({
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
   const [isTagsModalOpen, setIsTagsModalOpen] = useState(false)
   const [isDeleting, setIsDeleting] = useState(false)
-  const menuButtonRef = useRef<HTMLButtonElement>(null)
 
   const searchParams = new URLSearchParams({
     kbName: title,
@@ -152,23 +151,6 @@ export function BaseCard({
 
   const shortId = id ? `kb-${id.slice(0, 8)}` : ''
 
-  const handleMenuButtonClick = useCallback(
-    (e: React.MouseEvent) => {
-      e.stopPropagation()
-      if (menuButtonRef.current) {
-        const rect = menuButtonRef.current.getBoundingClientRect()
-        const syntheticEvent = {
-          preventDefault: () => {},
-          stopPropagation: () => {},
-          clientX: rect.right,
-          clientY: rect.bottom,
-        } as React.MouseEvent
-        handleContextMenu(syntheticEvent)
-      }
-    },
-    [handleContextMenu]
-  )
-
   const handleClick = useCallback(
     (e: React.MouseEvent) => {
       if (isContextMenuOpen) {
@@ -241,24 +223,9 @@ export function BaseCard({
             <h3 className='min-w-0 flex-1 truncate font-medium text-[14px] text-[var(--text-primary)]'>
               {title}
             </h3>
-            <div className='flex items-center gap-[4px]'>
-              {shortId && (
-                <Badge className='flex-shrink-0 rounded-[4px] text-[12px]'>{shortId}</Badge>
-              )}
-              <Button
-                ref={menuButtonRef}
-                variant='ghost'
-                size='sm'
-                className='h-[20px] w-[20px] flex-shrink-0 p-0 text-[var(--text-tertiary)]'
-                onClick={handleMenuButtonClick}
-              >
-                <svg className='h-[14px] w-[14px]' viewBox='0 0 16 16' fill='currentColor'>
-                  <circle cx='3' cy='8' r='1.5' />
-                  <circle cx='8' cy='8' r='1.5' />
-                  <circle cx='13' cy='8' r='1.5' />
-                </svg>
-              </Button>
-            </div>
+            {shortId && (
+              <Badge className='flex-shrink-0 rounded-[4px] text-[12px]'>{shortId}</Badge>
+            )}
           </div>
 
           <div className='flex flex-1 flex-col gap-[8px]'>

apps/sim/app/workspace/[workspaceId]/knowledge/components/edit-knowledge-base-modal/edit-knowledge-base-modal.tsx

@@ -70,12 +70,6 @@ export function EditKnowledgeBaseModal({
   })
 
   const nameValue = watch('name')
-  const descriptionValue = watch('description')
-
-  // Check if form values have changed from initial values
-  const hasChanges =
-    nameValue?.trim() !== initialName.trim() ||
-    (descriptionValue?.trim() || '') !== (initialDescription?.trim() || '')
 
   useEffect(() => {
     if (open) {
@@ -165,9 +159,9 @@ export function EditKnowledgeBaseModal({
                   Cancel
                 </Button>
                 <Button
-                  variant={hasChanges ? 'tertiary' : 'default'}
+                  variant='tertiary'
                   type='submit'
-                  disabled={isSubmitting || !nameValue?.trim() || !hasChanges}
+                  disabled={isSubmitting || !nameValue?.trim()}
                 >
                   {isSubmitting ? 'Saving...' : 'Save'}
                 </Button>

apps/sim/app/workspace/[workspaceId]/knowledge/knowledge.tsx

@@ -265,11 +265,12 @@ export function Knowledge() {
                   </div>
                 </div>
               ) : error ? (
-                <div className='col-span-full flex h-64 items-center justify-center'>
-                  <div className='text-[var(--text-error)]'>
-                    <span className='text-[13px]'>
-                      Error: {typeof error === 'string' ? error : 'Failed to load knowledge bases'}
-                    </span>
+                <div className='col-span-full flex h-64 items-center justify-center rounded-lg border border-muted-foreground/25 bg-muted/20'>
+                  <div className='text-center'>
+                    <p className='font-medium text-[var(--text-secondary)] text-sm'>
+                      Error loading knowledge bases
+                    </p>
+                    <p className='mt-1 text-[var(--text-muted)] text-xs'>{error}</p>
                   </div>
                 </div>
               ) : (

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/body-states.tsx

@@ -1,72 +0,0 @@
-import { Plus } from 'lucide-react'
-import { Button, TableCell, TableRow } from '@/components/emcn'
-import { Skeleton } from '@/components/ui/skeleton'
-import type { ColumnDefinition } from '@/lib/table'
-
-interface LoadingRowsProps {
-  columns: ColumnDefinition[]
-}
-
-export function LoadingRows({ columns }: LoadingRowsProps) {
-  return (
-    <>
-      {Array.from({ length: 25 }).map((_, rowIndex) => (
-        <TableRow key={rowIndex}>
-          <TableCell>
-            <Skeleton className='h-[14px] w-[14px]' />
-          </TableCell>
-          {columns.map((col, colIndex) => {
-            const baseWidth =
-              col.type === 'json'
-                ? 200
-                : col.type === 'string'
-                  ? 160
-                  : col.type === 'number'
-                    ? 80
-                    : col.type === 'boolean'
-                      ? 50
-                      : col.type === 'date'
-                        ? 100
-                        : 120
-            const variation = ((rowIndex + colIndex) % 3) * 20
-            const width = baseWidth + variation
-
-            return (
-              <TableCell key={col.name}>
-                <Skeleton className='h-[16px]' style={{ width: `${width}px` }} />
-              </TableCell>
-            )
-          })}
-        </TableRow>
-      ))}
-    </>
-  )
-}
-
-interface EmptyRowsProps {
-  columnCount: number
-  hasFilter: boolean
-  onAddRow: () => void
-}
-
-export function EmptyRows({ columnCount, hasFilter, onAddRow }: EmptyRowsProps) {
-  return (
-    <TableRow>
-      <TableCell colSpan={columnCount + 1} className='h-[160px]'>
-        <div className='flex h-full w-full items-center justify-center'>
-          <div className='flex flex-col items-center gap-[12px]'>
-            <span className='text-[13px] text-[var(--text-tertiary)]'>
-              {hasFilter ? 'No rows match your filter' : 'No data'}
-            </span>
-            {!hasFilter && (
-              <Button variant='default' size='sm' onClick={onAddRow}>
-                <Plus className='mr-[4px] h-[12px] w-[12px]' />
-                Add first row
-              </Button>
-            )}
-          </div>
-        </div>
-      </TableCell>
-    </TableRow>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/cell-renderer.tsx

@@ -1,99 +0,0 @@
-import type { ColumnDefinition } from '@/lib/table'
-import { STRING_TRUNCATE_LENGTH } from '../lib/constants'
-import type { CellViewerData } from '../lib/types'
-
-interface CellRendererProps {
-  value: unknown
-  column: ColumnDefinition
-  onCellClick: (columnName: string, value: unknown, type: CellViewerData['type']) => void
-}
-
-export function CellRenderer({ value, column, onCellClick }: CellRendererProps) {
-  const isNull = value === null || value === undefined
-
-  if (isNull) {
-    return <span className='text-[var(--text-muted)] italic'>—</span>
-  }
-
-  if (column.type === 'json') {
-    const jsonStr = JSON.stringify(value)
-    return (
-      <button
-        type='button'
-        className='block max-w-[300px] cursor-pointer select-none truncate rounded-[4px] border border-[var(--border-1)] px-[6px] py-[2px] text-left font-mono text-[11px] text-[var(--text-secondary)] transition-colors hover:border-[var(--text-muted)] hover:text-[var(--text-primary)]'
-        onClick={(e) => {
-          e.preventDefault()
-          e.stopPropagation()
-          onCellClick(column.name, value, 'json')
-        }}
-        title='Click to view full JSON'
-      >
-        {jsonStr}
-      </button>
-    )
-  }
-
-  if (column.type === 'boolean') {
-    const boolValue = Boolean(value)
-    return (
-      <span className={boolValue ? 'text-green-500' : 'text-[var(--text-tertiary)]'}>
-        {boolValue ? 'true' : 'false'}
-      </span>
-    )
-  }
-
-  if (column.type === 'number') {
-    return (
-      <span className='font-mono text-[12px] text-[var(--text-secondary)]'>{String(value)}</span>
-    )
-  }
-
-  if (column.type === 'date') {
-    try {
-      const date = new Date(String(value))
-      const formatted = date.toLocaleDateString('en-US', {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-      })
-      return (
-        <button
-          type='button'
-          className='cursor-pointer select-none text-left text-[12px] text-[var(--text-secondary)] underline decoration-[var(--border-1)] decoration-dotted underline-offset-2 transition-colors hover:text-[var(--text-primary)] hover:decoration-[var(--text-muted)]'
-          onClick={(e) => {
-            e.preventDefault()
-            e.stopPropagation()
-            onCellClick(column.name, value, 'date')
-          }}
-          title='Click to view ISO format'
-        >
-          {formatted}
-        </button>
-      )
-    } catch {
-      return <span className='text-[var(--text-primary)]'>{String(value)}</span>
-    }
-  }
-
-  const strValue = String(value)
-  if (strValue.length > STRING_TRUNCATE_LENGTH) {
-    return (
-      <button
-        type='button'
-        className='block max-w-[300px] cursor-pointer select-none truncate text-left text-[var(--text-primary)] underline decoration-[var(--border-1)] decoration-dotted underline-offset-2 transition-colors hover:decoration-[var(--text-muted)]'
-        onClick={(e) => {
-          e.preventDefault()
-          e.stopPropagation()
-          onCellClick(column.name, value, 'text')
-        }}
-        title='Click to view full text'
-      >
-        {strValue}
-      </button>
-    )
-  }
-
-  return <span className='text-[var(--text-primary)]'>{strValue}</span>
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/cell-viewer-modal.tsx

@@ -1,84 +0,0 @@
-import { Copy, X } from 'lucide-react'
-import { Badge, Button, Modal, ModalBody, ModalContent } from '@/components/emcn'
-import type { CellViewerData } from '../lib/types'
-
-interface CellViewerModalProps {
-  cellViewer: CellViewerData | null
-  onClose: () => void
-  onCopy: () => void
-  copied: boolean
-}
-
-export function CellViewerModal({ cellViewer, onClose, onCopy, copied }: CellViewerModalProps) {
-  if (!cellViewer) return null
-
-  return (
-    <Modal open={!!cellViewer} onOpenChange={(open) => !open && onClose()}>
-      <ModalContent className='w-[640px] duration-100'>
-        <div className='flex items-center justify-between gap-[8px] px-[16px] py-[10px]'>
-          <div className='flex min-w-0 items-center gap-[8px]'>
-            <span className='truncate font-medium text-[14px] text-[var(--text-primary)]'>
-              {cellViewer.columnName}
-            </span>
-            <Badge
-              variant={
-                cellViewer.type === 'json' ? 'blue' : cellViewer.type === 'date' ? 'purple' : 'gray'
-              }
-              size='sm'
-            >
-              {cellViewer.type === 'json' ? 'JSON' : cellViewer.type === 'date' ? 'Date' : 'Text'}
-            </Badge>
-          </div>
-          <div className='flex shrink-0 items-center gap-[8px]'>
-            <Button variant={copied ? 'tertiary' : 'default'} size='sm' onClick={onCopy}>
-              <Copy className='mr-[4px] h-[12px] w-[12px]' />
-              {copied ? 'Copied!' : 'Copy'}
-            </Button>
-            <Button variant='ghost' size='sm' onClick={onClose}>
-              <X className='h-[14px] w-[14px]' />
-            </Button>
-          </div>
-        </div>
-        <ModalBody className='p-0'>
-          {cellViewer.type === 'json' ? (
-            <pre className='m-[16px] max-h-[450px] overflow-auto rounded-[6px] border border-[var(--border)] bg-[var(--surface-4)] p-[16px] font-mono text-[12px] text-[var(--text-primary)] leading-[1.6]'>
-              {JSON.stringify(cellViewer.value, null, 2)}
-            </pre>
-          ) : cellViewer.type === 'date' ? (
-            <div className='m-[16px] space-y-[12px]'>
-              <div className='rounded-[6px] border border-[var(--border)] bg-[var(--surface-4)] p-[16px]'>
-                <div className='mb-[6px] font-medium text-[11px] text-[var(--text-tertiary)] uppercase tracking-wide'>
-                  Formatted
-                </div>
-                <div className='text-[14px] text-[var(--text-primary)]'>
-                  {new Date(String(cellViewer.value)).toLocaleDateString('en-US', {
-                    weekday: 'long',
-                    year: 'numeric',
-                    month: 'long',
-                    day: 'numeric',
-                    hour: '2-digit',
-                    minute: '2-digit',
-                    second: '2-digit',
-                    timeZoneName: 'short',
-                  })}
-                </div>
-              </div>
-              <div className='rounded-[6px] border border-[var(--border)] bg-[var(--surface-4)] p-[16px]'>
-                <div className='mb-[6px] font-medium text-[11px] text-[var(--text-tertiary)] uppercase tracking-wide'>
-                  ISO Format
-                </div>
-                <div className='font-mono text-[13px] text-[var(--text-secondary)]'>
-                  {String(cellViewer.value)}
-                </div>
-              </div>
-            </div>
-          ) : (
-            <div className='m-[16px] max-h-[450px] overflow-auto whitespace-pre-wrap break-words rounded-[6px] border border-[var(--border)] bg-[var(--surface-4)] p-[16px] text-[13px] text-[var(--text-primary)] leading-[1.7]'>
-              {String(cellViewer.value)}
-            </div>
-          )}
-        </ModalBody>
-      </ModalContent>
-    </Modal>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/context-menu.tsx

@@ -1,49 +0,0 @@
-import { Edit, Trash2 } from 'lucide-react'
-import {
-  Popover,
-  PopoverAnchor,
-  PopoverContent,
-  PopoverDivider,
-  PopoverItem,
-} from '@/components/emcn'
-import type { ContextMenuState } from '../lib/types'
-
-interface ContextMenuProps {
-  contextMenu: ContextMenuState
-  onClose: () => void
-  onEdit: () => void
-  onDelete: () => void
-}
-
-export function ContextMenu({ contextMenu, onClose, onEdit, onDelete }: ContextMenuProps) {
-  return (
-    <Popover
-      open={contextMenu.isOpen}
-      onOpenChange={(open) => !open && onClose()}
-      variant='secondary'
-      size='sm'
-      colorScheme='inverted'
-    >
-      <PopoverAnchor
-        style={{
-          position: 'fixed',
-          left: `${contextMenu.position.x}px`,
-          top: `${contextMenu.position.y}px`,
-          width: '1px',
-          height: '1px',
-        }}
-      />
-      <PopoverContent align='start' side='bottom' sideOffset={4}>
-        <PopoverItem onClick={onEdit}>
-          <Edit className='mr-[8px] h-[12px] w-[12px]' />
-          Edit row
-        </PopoverItem>
-        <PopoverDivider />
-        <PopoverItem onClick={onDelete} className='text-[var(--text-error)]'>
-          <Trash2 className='mr-[8px] h-[12px] w-[12px]' />
-          Delete row
-        </PopoverItem>
-      </PopoverContent>
-    </Popover>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/editable-cell.tsx

@@ -1,207 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { ChevronRight } from 'lucide-react'
-import { Checkbox, Input, Textarea } from '@/components/emcn'
-import { cn } from '@/lib/core/utils/cn'
-import type { ColumnDefinition } from '@/lib/table'
-
-interface EditableCellProps {
-  value: unknown
-  column: ColumnDefinition
-  onChange: (value: unknown) => void
-  isEditing?: boolean
-  isNew?: boolean
-}
-
-function formatValueForDisplay(value: unknown, type: string): string {
-  if (value === null || value === undefined) return 'NULL'
-  if (type === 'json') {
-    return typeof value === 'string' ? value : JSON.stringify(value)
-  }
-  if (type === 'boolean') {
-    return value ? 'TRUE' : 'FALSE'
-  }
-  if (type === 'date' && value) {
-    try {
-      const date = new Date(String(value))
-      return date.toLocaleDateString('en-US', {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-      })
-    } catch {
-      return String(value)
-    }
-  }
-  return String(value)
-}
-
-function formatValueForInput(value: unknown, type: string): string {
-  if (value === null || value === undefined) return ''
-  if (type === 'json') {
-    return typeof value === 'string' ? value : JSON.stringify(value, null, 2)
-  }
-  if (type === 'date' && value) {
-    try {
-      const date = new Date(String(value))
-      return date.toISOString().split('T')[0]
-    } catch {
-      return String(value)
-    }
-  }
-  return String(value)
-}
-
-export function EditableCell({
-  value,
-  column,
-  onChange,
-  isEditing = false,
-  isNew = false,
-}: EditableCellProps) {
-  const [localValue, setLocalValue] = useState<unknown>(value)
-  const [isActive, setIsActive] = useState(false)
-  const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement>(null)
-
-  useEffect(() => {
-    setLocalValue(value)
-  }, [value])
-
-  useEffect(() => {
-    if (isActive && inputRef.current) {
-      inputRef.current.focus()
-    }
-  }, [isActive])
-
-  const handleFocus = useCallback(() => {
-    setIsActive(true)
-  }, [])
-
-  const handleBlur = useCallback(() => {
-    setIsActive(false)
-    if (localValue !== value) {
-      onChange(localValue)
-    }
-  }, [localValue, value, onChange])
-
-  const handleChange = useCallback((newValue: unknown) => {
-    setLocalValue(newValue)
-  }, [])
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === 'Enter' && !e.shiftKey && column.type !== 'json') {
-        e.preventDefault()
-        ;(e.target as HTMLElement).blur()
-      }
-      if (e.key === 'Escape') {
-        setLocalValue(value)
-        ;(e.target as HTMLElement).blur()
-      }
-    },
-    [value, column.type]
-  )
-
-  const isNull = value === null || value === undefined
-
-  // Boolean type - always show checkbox
-  if (column.type === 'boolean') {
-    return (
-      <div className='flex items-center'>
-        <Checkbox
-          size='sm'
-          checked={Boolean(localValue)}
-          onCheckedChange={(checked) => {
-            const newValue = checked === true
-            setLocalValue(newValue)
-            onChange(newValue)
-          }}
-        />
-        <span
-          className={cn(
-            'ml-[8px] text-[12px]',
-            localValue ? 'text-green-500' : 'text-[var(--text-tertiary)]'
-          )}
-        >
-          {localValue ? 'TRUE' : 'FALSE'}
-        </span>
-      </div>
-    )
-  }
-
-  // JSON type - use textarea
-  if (column.type === 'json') {
-    if (isActive || isNew) {
-      return (
-        <Textarea
-          ref={inputRef as React.RefObject<HTMLTextAreaElement>}
-          value={formatValueForInput(localValue, column.type)}
-          onChange={(e) => handleChange(e.target.value)}
-          onFocus={handleFocus}
-          onBlur={handleBlur}
-          onKeyDown={handleKeyDown}
-          className='h-[60px] min-w-[200px] resize-none font-mono text-[11px]'
-          placeholder='{"key": "value"}'
-        />
-      )
-    }
-
-    return (
-      <button
-        type='button'
-        onClick={handleFocus}
-        className={cn(
-          'group flex max-w-[300px] cursor-pointer items-center truncate text-left font-mono text-[11px] transition-colors',
-          isNull
-            ? 'text-[var(--text-muted)] italic'
-            : 'text-[var(--text-secondary)] hover:text-[var(--text-primary)]'
-        )}
-      >
-        <span className='truncate'>{formatValueForDisplay(value, column.type)}</span>
-        <ChevronRight className='ml-[4px] h-[10px] w-[10px] opacity-0 group-hover:opacity-100' />
-      </button>
-    )
-  }
-
-  // Active/editing state for other types
-  if (isActive || isNew) {
-    return (
-      <Input
-        ref={inputRef as React.RefObject<HTMLInputElement>}
-        type={column.type === 'number' ? 'number' : column.type === 'date' ? 'date' : 'text'}
-        value={formatValueForInput(localValue, column.type)}
-        onChange={(e) => handleChange(e.target.value)}
-        onFocus={handleFocus}
-        onBlur={handleBlur}
-        onKeyDown={handleKeyDown}
-        className={cn(
-          'h-[28px] min-w-[120px] text-[12px]',
-          column.type === 'number' && 'font-mono'
-        )}
-        placeholder={isNull ? 'NULL' : ''}
-      />
-    )
-  }
-
-  // Display state
-  return (
-    <button
-      type='button'
-      onClick={handleFocus}
-      className={cn(
-        'group flex max-w-[300px] cursor-pointer items-center truncate text-left text-[13px] transition-colors',
-        isNull
-          ? 'text-[var(--text-muted)] italic'
-          : column.type === 'number'
-            ? 'font-mono text-[12px] text-[var(--text-secondary)]'
-            : 'text-[var(--text-primary)]'
-      )}
-    >
-      <span className='truncate'>{formatValueForDisplay(value, column.type)}</span>
-      <ChevronRight className='ml-[4px] h-[10px] w-[10px] opacity-0 group-hover:opacity-100' />
-    </button>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/editable-row.tsx

@@ -1,41 +0,0 @@
-'use client'
-
-import { X } from 'lucide-react'
-import { Button, TableCell, TableRow } from '@/components/emcn'
-import type { ColumnDefinition } from '@/lib/table'
-import type { TempRow } from '../hooks/use-inline-editing'
-import { EditableCell } from './editable-cell'
-
-interface EditableRowProps {
-  row: TempRow
-  columns: ColumnDefinition[]
-  onUpdateCell: (tempId: string, column: string, value: unknown) => void
-  onRemove: (tempId: string) => void
-}
-
-export function EditableRow({ row, columns, onUpdateCell, onRemove }: EditableRowProps) {
-  return (
-    <TableRow className='bg-amber-500/20 hover:bg-amber-500/30'>
-      <TableCell className='w-[40px]'>
-        <Button
-          variant='ghost'
-          size='sm'
-          onClick={() => onRemove(row.tempId)}
-          className='h-[20px] w-[20px] p-0 text-[var(--text-tertiary)] hover:text-[var(--text-primary)]'
-        >
-          <X className='h-[12px] w-[12px]' />
-        </Button>
-      </TableCell>
-      {columns.map((column) => (
-        <TableCell key={column.name}>
-          <EditableCell
-            value={row.data[column.name]}
-            column={column}
-            onChange={(value) => onUpdateCell(row.tempId, column.name, value)}
-            isNew
-          />
-        </TableCell>
-      ))}
-    </TableRow>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/filter-panel.tsx

@@ -1,169 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { Plus, X } from 'lucide-react'
-import { Button, Combobox, Input } from '@/components/emcn'
-import type { FilterRule } from '@/lib/table/query-builder/constants'
-import { filterRulesToFilter } from '@/lib/table/query-builder/converters'
-import { useFilterBuilder } from '@/lib/table/query-builder/use-query-builder'
-import type { ColumnDefinition } from '@/lib/table/types'
-import type { QueryOptions } from '../lib/types'
-
-type Column = Pick<ColumnDefinition, 'name' | 'type'>
-
-interface FilterPanelProps {
-  columns: Column[]
-  isVisible: boolean
-  onApply: (options: QueryOptions) => void
-  onClose: () => void
-  isLoading?: boolean
-}
-
-// Operators that don't need a value input
-const NO_VALUE_OPERATORS = ['is_null', 'is_not_null']
-
-// Options for the first filter row
-const WHERE_OPTIONS = [{ value: 'where', label: 'where' }]
-
-export function FilterPanel({
-  columns,
-  isVisible,
-  onApply,
-  onClose,
-  isLoading = false,
-}: FilterPanelProps) {
-  const [rules, setRules] = useState<FilterRule[]>([])
-
-  const columnOptions = useMemo(
-    () => columns.map((col) => ({ value: col.name, label: col.name })),
-    [columns]
-  )
-
-  const {
-    comparisonOptions,
-    logicalOptions,
-    addRule: handleAddRule,
-    removeRule: handleRemoveRule,
-    updateRule: handleUpdateRule,
-  } = useFilterBuilder({
-    columns: columnOptions,
-    rules,
-    setRules,
-  })
-
-  // Auto-add first filter when panel opens with no filters
-  useEffect(() => {
-    if (isVisible && rules.length === 0 && columns.length > 0) {
-      handleAddRule()
-    }
-  }, [isVisible, rules.length, columns.length, handleAddRule])
-
-  const handleApply = useCallback(() => {
-    const filter = filterRulesToFilter(rules)
-    onApply({ filter, sort: null })
-  }, [rules, onApply])
-
-  const handleClear = useCallback(() => {
-    setRules([])
-    onApply({ filter: null, sort: null })
-    onClose()
-  }, [onApply, onClose])
-
-  if (!isVisible) {
-    return null
-  }
-
-  return (
-    <div className='flex shrink-0 flex-col gap-2 border-[var(--border)] border-b px-4 py-3'>
-      {rules.map((rule, index) => {
-        const needsValue = !NO_VALUE_OPERATORS.includes(rule.operator)
-        const isFirst = index === 0
-
-        return (
-          <div key={rule.id} className='flex items-center gap-2'>
-            {/* Remove button */}
-            <Button
-              variant='ghost'
-              size='sm'
-              onClick={() => handleRemoveRule(rule.id)}
-              aria-label='Remove filter'
-              className='shrink-0 p-1'
-            >
-              <X className='h-3.5 w-3.5' />
-            </Button>
-
-            {/* Where / And / Or */}
-            <div className='w-20 shrink-0'>
-              {isFirst ? (
-                <Combobox size='sm' options={WHERE_OPTIONS} value='where' onChange={() => {}} />
-              ) : (
-                <Combobox
-                  size='sm'
-                  options={logicalOptions}
-                  value={rule.logicalOperator}
-                  onChange={(value) =>
-                    handleUpdateRule(rule.id, 'logicalOperator', value as 'and' | 'or')
-                  }
-                />
-              )}
-            </div>
-
-            {/* Column */}
-            <div className='w-[140px] shrink-0'>
-              <Combobox
-                size='sm'
-                options={columnOptions}
-                value={rule.column}
-                onChange={(value) => handleUpdateRule(rule.id, 'column', value)}
-                placeholder='Column'
-              />
-            </div>
-
-            {/* Operator */}
-            <div className='w-[120px] shrink-0'>
-              <Combobox
-                size='sm'
-                options={comparisonOptions}
-                value={rule.operator}
-                onChange={(value) => handleUpdateRule(rule.id, 'operator', value)}
-              />
-            </div>
-
-            {/* Value (only if operator needs it) */}
-            {needsValue && (
-              <Input
-                className='w-[160px] shrink-0'
-                value={rule.value}
-                onChange={(e) => handleUpdateRule(rule.id, 'value', e.target.value)}
-                placeholder='Enter a value'
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter') {
-                    handleApply()
-                  }
-                }}
-              />
-            )}
-
-            {/* Actions - only on first row */}
-            {isFirst && (
-              <div className='ml-1 flex items-center gap-1'>
-                <Button variant='tertiary' size='sm' onClick={handleApply} disabled={isLoading}>
-                  Apply
-                </Button>
-
-                <Button variant='ghost' size='sm' onClick={handleAddRule}>
-                  <Plus className='h-3 w-3' />
-                  Add filter
-                </Button>
-
-                <Button variant='ghost' size='sm' onClick={handleClear}>
-                  Clear filters
-                </Button>
-              </div>
-            )}
-          </div>
-        )
-      })}
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/index.ts

@@ -1,11 +0,0 @@
-export * from './body-states'
-export * from './cell-renderer'
-export * from './cell-viewer-modal'
-export * from './context-menu'
-export * from './editable-cell'
-export * from './editable-row'
-export * from './filter-panel'
-export * from './row-modal'
-export * from './schema-modal'
-export * from './table-toolbar'
-export * from './table-viewer'

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/row-modal.tsx

@@ -1,399 +0,0 @@
-'use client'
-
-import { useEffect, useMemo, useState } from 'react'
-import { createLogger } from '@sim/logger'
-import { useParams } from 'next/navigation'
-import {
-  Badge,
-  Button,
-  Checkbox,
-  Input,
-  Label,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Textarea,
-} from '@/components/emcn'
-import type { ColumnDefinition, TableInfo, TableRow } from '@/lib/table'
-
-const logger = createLogger('RowModal')
-
-export interface RowModalProps {
-  mode: 'add' | 'edit' | 'delete'
-  isOpen: boolean
-  onClose: () => void
-  table: TableInfo
-  row?: TableRow
-  rowIds?: string[]
-  onSuccess: () => void
-}
-
-function createInitialRowData(columns: ColumnDefinition[]): Record<string, unknown> {
-  const initial: Record<string, unknown> = {}
-  columns.forEach((col) => {
-    if (col.type === 'boolean') {
-      initial[col.name] = false
-    } else {
-      initial[col.name] = ''
-    }
-  })
-  return initial
-}
-
-function cleanRowData(
-  columns: ColumnDefinition[],
-  rowData: Record<string, unknown>
-): Record<string, unknown> {
-  const cleanData: Record<string, unknown> = {}
-
-  columns.forEach((col) => {
-    const value = rowData[col.name]
-    if (col.type === 'number') {
-      cleanData[col.name] = value === '' ? null : Number(value)
-    } else if (col.type === 'json') {
-      if (typeof value === 'string') {
-        if (value === '') {
-          cleanData[col.name] = null
-        } else {
-          try {
-            cleanData[col.name] = JSON.parse(value)
-          } catch {
-            throw new Error(`Invalid JSON for field: ${col.name}`)
-          }
-        }
-      } else {
-        cleanData[col.name] = value
-      }
-    } else if (col.type === 'boolean') {
-      cleanData[col.name] = Boolean(value)
-    } else {
-      cleanData[col.name] = value || null
-    }
-  })
-
-  return cleanData
-}
-
-function formatValueForInput(value: unknown, type: string): string {
-  if (value === null || value === undefined) return ''
-  if (type === 'json') {
-    return typeof value === 'string' ? value : JSON.stringify(value, null, 2)
-  }
-  if (type === 'date' && value) {
-    try {
-      const date = new Date(String(value))
-      return date.toISOString().split('T')[0]
-    } catch {
-      return String(value)
-    }
-  }
-  return String(value)
-}
-
-function isFieldEmpty(value: unknown, type: string): boolean {
-  if (value === null || value === undefined) return true
-  if (type === 'boolean') return false // booleans always have a value (true/false)
-  if (typeof value === 'string') return value.trim() === ''
-  return false
-}
-
-export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess }: RowModalProps) {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const schema = table?.schema
-  const columns = schema?.columns || []
-
-  const [rowData, setRowData] = useState<Record<string, unknown>>({})
-  const [error, setError] = useState<string | null>(null)
-  const [isSubmitting, setIsSubmitting] = useState(false)
-
-  // Check if all required fields are filled
-  const hasRequiredFields = useMemo(() => {
-    const requiredColumns = columns.filter((col) => col.required)
-    return requiredColumns.every((col) => !isFieldEmpty(rowData[col.name], col.type))
-  }, [columns, rowData])
-
-  // Initialize form data based on mode
-  useEffect(() => {
-    if (!isOpen) return
-
-    if (mode === 'add' && columns.length > 0) {
-      setRowData(createInitialRowData(columns))
-    } else if (mode === 'edit' && row) {
-      setRowData(row.data)
-    }
-  }, [isOpen, mode, columns, row])
-
-  const handleFormSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    setError(null)
-    setIsSubmitting(true)
-
-    try {
-      const cleanData = cleanRowData(columns, rowData)
-
-      if (mode === 'add') {
-        const res = await fetch(`/api/table/${table?.id}/rows`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId, data: cleanData }),
-        })
-
-        const result: { error?: string } = await res.json()
-        if (!res.ok) {
-          throw new Error(result.error || 'Failed to add row')
-        }
-      } else if (mode === 'edit' && row) {
-        const res = await fetch(`/api/table/${table?.id}/rows/${row.id}`, {
-          method: 'PATCH',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId, data: cleanData }),
-        })
-
-        const result: { error?: string } = await res.json()
-        if (!res.ok) {
-          throw new Error(result.error || 'Failed to update row')
-        }
-      }
-
-      onSuccess()
-    } catch (err) {
-      logger.error(`Failed to ${mode} row:`, err)
-      setError(err instanceof Error ? err.message : `Failed to ${mode} row`)
-    } finally {
-      setIsSubmitting(false)
-    }
-  }
-
-  const handleDelete = async () => {
-    setError(null)
-    setIsSubmitting(true)
-
-    const idsToDelete = rowIds ?? (row ? [row.id] : [])
-
-    try {
-      if (idsToDelete.length === 1) {
-        const res = await fetch(`/api/table/${table?.id}/rows/${idsToDelete[0]}`, {
-          method: 'DELETE',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId }),
-        })
-
-        if (!res.ok) {
-          const result: { error?: string } = await res.json()
-          throw new Error(result.error || 'Failed to delete row')
-        }
-      } else {
-        const results = await Promise.allSettled(
-          idsToDelete.map(async (rowId) => {
-            const res = await fetch(`/api/table/${table?.id}/rows/${rowId}`, {
-              method: 'DELETE',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ workspaceId }),
-            })
-
-            if (!res.ok) {
-              const result: { error?: string } = await res.json().catch(() => ({}))
-              throw new Error(result.error || `Failed to delete row ${rowId}`)
-            }
-
-            return rowId
-          })
-        )
-
-        const failures = results.filter((r) => r.status === 'rejected')
-
-        if (failures.length > 0) {
-          const failureCount = failures.length
-          const totalCount = idsToDelete.length
-          const successCount = totalCount - failureCount
-          const firstError =
-            failures[0].status === 'rejected' ? failures[0].reason?.message || 'Unknown error' : ''
-
-          throw new Error(
-            `Failed to delete ${failureCount} of ${totalCount} row(s)${successCount > 0 ? ` (${successCount} deleted successfully)` : ''}. ${firstError}`
-          )
-        }
-      }
-
-      onSuccess()
-    } catch (err) {
-      logger.error('Failed to delete row(s):', err)
-      setError(err instanceof Error ? err.message : 'Failed to delete row(s)')
-    } finally {
-      setIsSubmitting(false)
-    }
-  }
-
-  const handleClose = () => {
-    setRowData({})
-    setError(null)
-    onClose()
-  }
-
-  // Delete mode UI
-  if (mode === 'delete') {
-    const deleteCount = rowIds?.length ?? (row ? 1 : 0)
-    const isSingleRow = deleteCount === 1
-
-    return (
-      <Modal open={isOpen} onOpenChange={handleClose}>
-        <ModalContent size='sm'>
-          <ModalHeader>Delete {isSingleRow ? 'Row' : `${deleteCount} Rows`}</ModalHeader>
-          <ModalBody>
-            <ErrorMessage error={error} />
-            <p className='text-[12px] text-[var(--text-secondary)]'>
-              Are you sure you want to delete{' '}
-              <span className='font-medium text-[var(--text-primary)]'>
-                {isSingleRow ? '1 row' : `${deleteCount} rows`}
-              </span>
-              ? This will permanently remove the data.{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
-            </p>
-          </ModalBody>
-          <ModalFooter>
-            <Button variant='default' onClick={handleClose} disabled={isSubmitting}>
-              Cancel
-            </Button>
-            <Button variant='destructive' onClick={handleDelete} disabled={isSubmitting}>
-              {isSubmitting ? 'Deleting...' : 'Delete'}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    )
-  }
-
-  const isAddMode = mode === 'add'
-
-  return (
-    <Modal open={isOpen} onOpenChange={handleClose}>
-      <ModalContent className='max-w-[480px]'>
-        <ModalHeader>{isAddMode ? 'Add New Row' : 'Edit Row'}</ModalHeader>
-        <ModalBody className='max-h-[60vh] space-y-[12px] overflow-y-auto'>
-          <ErrorMessage error={error} />
-
-          <div className='flex flex-col gap-[8px]'>
-            {columns.map((column) => (
-              <ColumnField
-                key={column.name}
-                column={column}
-                value={rowData[column.name]}
-                onChange={(value) => setRowData((prev) => ({ ...prev, [column.name]: value }))}
-              />
-            ))}
-          </div>
-        </ModalBody>
-        <ModalFooter>
-          <Button variant='default' onClick={handleClose} disabled={isSubmitting}>
-            Cancel
-          </Button>
-          <Button
-            variant='tertiary'
-            onClick={handleFormSubmit}
-            disabled={isSubmitting || !hasRequiredFields}
-          >
-            {isSubmitting
-              ? isAddMode
-                ? 'Adding...'
-                : 'Updating...'
-              : isAddMode
-                ? 'Add Row'
-                : 'Update Row'}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  )
-}
-
-function ErrorMessage({ error }: { error: string | null }) {
-  if (!error) return null
-
-  return (
-    <div className='rounded-[8px] border border-[var(--status-error-border)] bg-[var(--status-error-bg)] px-[14px] py-[12px] text-[13px] text-[var(--status-error-text)]'>
-      {error}
-    </div>
-  )
-}
-
-interface ColumnFieldProps {
-  column: ColumnDefinition
-  value: unknown
-  onChange: (value: unknown) => void
-}
-
-function ColumnField({ column, value, onChange }: ColumnFieldProps) {
-  const renderInput = () => {
-    if (column.type === 'boolean') {
-      return (
-        <div className='flex items-center gap-[8px]'>
-          <Checkbox
-            id={column.name}
-            checked={Boolean(value)}
-            onCheckedChange={(checked) => onChange(checked === true)}
-          />
-          <Label
-            htmlFor={column.name}
-            className='font-normal text-[13px] text-[var(--text-tertiary)]'
-          >
-            {value ? 'True' : 'False'}
-          </Label>
-        </div>
-      )
-    }
-
-    if (column.type === 'json') {
-      return (
-        <Textarea
-          id={column.name}
-          value={formatValueForInput(value, column.type)}
-          onChange={(e) => onChange(e.target.value)}
-          placeholder='{"key": "value"}'
-          rows={3}
-          className='font-mono text-[12px]'
-          required={column.required}
-        />
-      )
-    }
-
-    return (
-      <Input
-        id={column.name}
-        type={column.type === 'number' ? 'number' : column.type === 'date' ? 'date' : 'text'}
-        value={formatValueForInput(value, column.type)}
-        onChange={(e) => onChange(e.target.value)}
-        placeholder={`Enter ${column.name}`}
-        required={column.required}
-      />
-    )
-  }
-
-  return (
-    <div className='overflow-hidden rounded-[4px] border border-[var(--border-1)]'>
-      <div className='flex items-center justify-between bg-[var(--surface-4)] px-[10px] py-[5px]'>
-        <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
-          <span className='block truncate font-medium text-[14px] text-[var(--text-tertiary)]'>
-            {column.name}
-            {column.required && <span className='text-[var(--text-error)]'> *</span>}
-          </span>
-          <Badge size='sm'>{column.type}</Badge>
-          {column.unique && (
-            <Badge size='sm' variant='gray-secondary'>
-              unique
-            </Badge>
-          )}
-        </div>
-      </div>
-      <div className='border-[var(--border-1)] border-t px-[10px] pt-[6px] pb-[10px]'>
-        <div className='flex flex-col gap-[6px]'>
-          <Label className='text-[13px]'>Value</Label>
-          {renderInput()}
-        </div>
-      </div>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/schema-modal.tsx

@@ -1,79 +0,0 @@
-import {
-  Badge,
-  Button,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/emcn'
-import type { ColumnDefinition } from '@/lib/table'
-
-interface SchemaModalProps {
-  isOpen: boolean
-  onClose: () => void
-  columns: ColumnDefinition[]
-}
-
-export function SchemaModal({ isOpen, onClose, columns }: SchemaModalProps) {
-  return (
-    <Modal open={isOpen} onOpenChange={onClose}>
-      <ModalContent size='sm'>
-        <ModalHeader>Table Schema</ModalHeader>
-        <ModalBody>
-          <div className='max-h-[400px] overflow-auto'>
-            <Table>
-              <TableHeader>
-                <TableRow>
-                  <TableHead className='w-[180px]'>Column</TableHead>
-                  <TableHead className='w-[100px]'>Type</TableHead>
-                  <TableHead>Constraints</TableHead>
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {columns.map((column) => (
-                  <TableRow key={column.name}>
-                    <TableCell>{column.name}</TableCell>
-                    <TableCell>
-                      <Badge variant='gray-secondary' size='sm'>
-                        {column.type}
-                      </Badge>
-                    </TableCell>
-                    <TableCell>
-                      <div className='flex gap-[6px]'>
-                        {column.required && (
-                          <Badge variant='gray-secondary' size='sm'>
-                            required
-                          </Badge>
-                        )}
-                        {column.unique && (
-                          <Badge variant='gray-secondary' size='sm'>
-                            unique
-                          </Badge>
-                        )}
-                        {!column.required && !column.unique && (
-                          <span className='text-[var(--text-muted)]'>—</span>
-                        )}
-                      </div>
-                    </TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </div>
-        </ModalBody>
-        <ModalFooter>
-          <Button variant='default' onClick={() => onClose(false)}>
-            Close
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-toolbar.tsx

@@ -1,194 +0,0 @@
-'use client'
-
-import {
-  ChevronLeft,
-  ChevronRight,
-  Filter,
-  MoreHorizontal,
-  Plus,
-  RefreshCw,
-  Trash2,
-} from 'lucide-react'
-import {
-  Button,
-  Popover,
-  PopoverContent,
-  PopoverItem,
-  PopoverTrigger,
-  Tooltip,
-} from '@/components/emcn'
-import { Skeleton } from '@/components/ui/skeleton'
-
-interface TableToolbarProps {
-  tableName: string
-  totalCount: number
-  isLoading: boolean
-  onNavigateBack: () => void
-  onShowSchema: () => void
-  onRefresh: () => void
-  showFilters: boolean
-  onToggleFilters: () => void
-  onAddRecord: () => void
-  selectedCount: number
-  onDeleteSelected: () => void
-  onClearSelection: () => void
-  hasPendingChanges: boolean
-  onSaveChanges: () => void
-  onDiscardChanges: () => void
-  isSaving: boolean
-  currentPage: number
-  totalPages: number
-  onPreviousPage: () => void
-  onNextPage: () => void
-}
-
-export function TableToolbar({
-  tableName,
-  totalCount,
-  isLoading,
-  onNavigateBack,
-  onShowSchema,
-  onRefresh,
-  showFilters,
-  onToggleFilters,
-  onAddRecord,
-  selectedCount,
-  onDeleteSelected,
-  onClearSelection,
-  hasPendingChanges,
-  onSaveChanges,
-  onDiscardChanges,
-  isSaving,
-  currentPage,
-  totalPages,
-  onPreviousPage,
-  onNextPage,
-}: TableToolbarProps) {
-  const hasSelection = selectedCount > 0
-
-  return (
-    <div className='flex h-[48px] shrink-0 items-center justify-between border-[var(--border)] border-b bg-[var(--surface-2)] px-[16px]'>
-      {/* Left section: Navigation and table info */}
-      <div className='flex items-center gap-[8px]'>
-        <button
-          onClick={onNavigateBack}
-          className='text-[13px] text-[var(--text-tertiary)] transition-colors hover:text-[var(--text-primary)]'
-        >
-          Tables
-        </button>
-        <span className='text-[var(--text-muted)]'>/</span>
-        <span className='font-medium text-[13px] text-[var(--text-primary)]'>{tableName}</span>
-      </div>
-
-      {/* Center section: Main actions */}
-      <div className='flex items-center gap-[8px]'>
-        {/* Pagination controls */}
-        <div className='flex items-center gap-[2px]'>
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <Button
-                variant='ghost'
-                size='sm'
-                onClick={onPreviousPage}
-                disabled={currentPage === 0 || isLoading}
-              >
-                <ChevronLeft className='h-[14px] w-[14px]' />
-              </Button>
-            </Tooltip.Trigger>
-            <Tooltip.Content>Previous page</Tooltip.Content>
-          </Tooltip.Root>
-
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <Button
-                variant='ghost'
-                size='sm'
-                onClick={onNextPage}
-                disabled={currentPage >= totalPages - 1 || isLoading}
-              >
-                <ChevronRight className='h-[14px] w-[14px]' />
-              </Button>
-            </Tooltip.Trigger>
-            <Tooltip.Content>Next page</Tooltip.Content>
-          </Tooltip.Root>
-        </div>
-
-        <div className='mx-[4px] h-[20px] w-[1px] bg-[var(--border)]' />
-
-        {/* Filters toggle */}
-        <Button variant={showFilters ? 'secondary' : 'ghost'} size='sm' onClick={onToggleFilters}>
-          <Filter className='mr-[4px] h-[12px] w-[12px]' />
-          Filters
-        </Button>
-
-        <div className='mx-[4px] h-[20px] w-[1px] bg-[var(--border)]' />
-
-        {/* Pending changes actions */}
-        {hasPendingChanges ? (
-          <>
-            <Button variant='tertiary' size='sm' onClick={onSaveChanges} disabled={isSaving}>
-              {isSaving ? 'Saving...' : 'Save changes'}
-            </Button>
-            <Button variant='ghost' size='sm' onClick={onDiscardChanges} disabled={isSaving}>
-              Discard changes
-            </Button>
-          </>
-        ) : (
-          <>
-            {/* Add record */}
-            <Button variant='default' size='sm' onClick={onAddRecord}>
-              <Plus className='mr-[4px] h-[12px] w-[12px]' />
-              Add record
-            </Button>
-
-            {/* Delete selected */}
-            {hasSelection && (
-              <Button variant='destructive' size='sm' onClick={onDeleteSelected}>
-                <Trash2 className='mr-[4px] h-[12px] w-[12px]' />
-                Delete {selectedCount} {selectedCount === 1 ? 'record' : 'records'}
-              </Button>
-            )}
-          </>
-        )}
-
-        {/* Clear selection */}
-        {hasSelection && !hasPendingChanges && (
-          <Button variant='ghost' size='sm' onClick={onClearSelection}>
-            Clear selection
-          </Button>
-        )}
-      </div>
-
-      {/* Right section: Row count and utilities */}
-      <div className='flex items-center gap-[6px]'>
-        {isLoading ? (
-          <Skeleton className='h-[16px] w-[50px]' />
-        ) : (
-          <span className='text-[13px] text-[var(--text-tertiary)]'>
-            {totalCount} {totalCount === 1 ? 'row' : 'rows'}
-          </span>
-        )}
-
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <Button variant='ghost' size='sm' onClick={onRefresh} disabled={isLoading}>
-              <RefreshCw className='h-[14px] w-[14px]' />
-            </Button>
-          </Tooltip.Trigger>
-          <Tooltip.Content>Refresh</Tooltip.Content>
-        </Tooltip.Root>
-
-        <Popover>
-          <PopoverTrigger asChild>
-            <Button variant='ghost' size='sm'>
-              <MoreHorizontal className='h-[14px] w-[14px]' />
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent align='end' className='w-[160px]'>
-            <PopoverItem onClick={onShowSchema}>View Schema</PopoverItem>
-          </PopoverContent>
-        </Popover>
-      </div>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-viewer.tsx

@@ -1,331 +0,0 @@
-'use client'
-
-import { useCallback, useState } from 'react'
-import { useParams, useRouter } from 'next/navigation'
-import {
-  Badge,
-  Checkbox,
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/emcn'
-import { cn } from '@/lib/core/utils/cn'
-import { useContextMenu, useInlineEditing, useRowSelection, useTableData } from '../hooks'
-import type { CellViewerData, QueryOptions } from '../lib/types'
-import { EmptyRows, LoadingRows } from './body-states'
-import { CellViewerModal } from './cell-viewer-modal'
-import { ContextMenu } from './context-menu'
-import { EditableCell } from './editable-cell'
-import { EditableRow } from './editable-row'
-import { FilterPanel } from './filter-panel'
-import { RowModal } from './row-modal'
-import { SchemaModal } from './schema-modal'
-import { TableToolbar } from './table-toolbar'
-
-export function TableViewer() {
-  const params = useParams()
-  const router = useRouter()
-
-  const workspaceId = params.workspaceId as string
-  const tableId = params.tableId as string
-
-  const [queryOptions, setQueryOptions] = useState<QueryOptions>({
-    filter: null,
-    sort: null,
-  })
-  const [currentPage, setCurrentPage] = useState(0)
-  const [showFilters, setShowFilters] = useState(false)
-  const [deletingRows, setDeletingRows] = useState<string[]>([])
-  const [showSchemaModal, setShowSchemaModal] = useState(false)
-
-  const [cellViewer, setCellViewer] = useState<CellViewerData | null>(null)
-  const [copied, setCopied] = useState(false)
-
-  const { tableData, isLoadingTable, rows, totalCount, totalPages, isLoadingRows, refetchRows } =
-    useTableData({
-      workspaceId,
-      tableId,
-      queryOptions,
-      currentPage,
-    })
-
-  const columns = tableData?.schema?.columns || []
-
-  const { selectedRows, handleSelectAll, handleSelectRow, clearSelection } = useRowSelection(rows)
-
-  const { contextMenu, handleRowContextMenu, closeContextMenu } = useContextMenu()
-
-  const {
-    newRows,
-    pendingChanges,
-    addNewRow,
-    updateNewRowCell,
-    updateExistingRowCell,
-    saveChanges,
-    discardChanges,
-    hasPendingChanges,
-    isSaving,
-  } = useInlineEditing({
-    workspaceId,
-    tableId,
-    columns,
-    onSuccess: refetchRows,
-  })
-
-  const selectedCount = selectedRows.size
-  const hasSelection = selectedCount > 0
-  const isAllSelected = rows.length > 0 && selectedCount === rows.length
-
-  const handleNavigateBack = useCallback(() => {
-    router.push(`/workspace/${workspaceId}/tables`)
-  }, [router, workspaceId])
-
-  const handleShowSchema = useCallback(() => {
-    setShowSchemaModal(true)
-  }, [])
-
-  const handleToggleFilters = useCallback(() => {
-    setShowFilters((prev) => !prev)
-  }, [])
-
-  const handleApplyQueryOptions = useCallback(
-    (options: QueryOptions) => {
-      setQueryOptions(options)
-      setCurrentPage(0)
-      refetchRows()
-    },
-    [refetchRows]
-  )
-
-  const handleDeleteSelected = useCallback(() => {
-    setDeletingRows(Array.from(selectedRows))
-  }, [selectedRows])
-
-  const handleContextMenuEdit = useCallback(() => {
-    // For inline editing, we don't need the modal anymore
-    // The cell becomes editable on click
-    closeContextMenu()
-  }, [closeContextMenu])
-
-  const handleContextMenuDelete = useCallback(() => {
-    if (contextMenu.row) {
-      setDeletingRows([contextMenu.row.id])
-    }
-    closeContextMenu()
-  }, [contextMenu.row, closeContextMenu])
-
-  const handleCopyCellValue = useCallback(async () => {
-    if (cellViewer) {
-      let text: string
-      if (cellViewer.type === 'json') {
-        text = JSON.stringify(cellViewer.value, null, 2)
-      } else if (cellViewer.type === 'date') {
-        text = String(cellViewer.value)
-      } else {
-        text = String(cellViewer.value)
-      }
-      await navigator.clipboard.writeText(text)
-      setCopied(true)
-      setTimeout(() => setCopied(false), 2000)
-    }
-  }, [cellViewer])
-
-  const handleCellClick = useCallback(
-    (columnName: string, value: unknown, type: CellViewerData['type']) => {
-      setCellViewer({ columnName, value, type })
-    },
-    []
-  )
-
-  const handleRemoveNewRow = useCallback(
-    (tempId: string) => {
-      discardChanges()
-    },
-    [discardChanges]
-  )
-
-  const handlePreviousPage = useCallback(() => {
-    setCurrentPage((p) => Math.max(0, p - 1))
-  }, [])
-
-  const handleNextPage = useCallback(() => {
-    setCurrentPage((p) => Math.min(totalPages - 1, p + 1))
-  }, [totalPages])
-
-  if (isLoadingTable) {
-    return (
-      <div className='flex h-full items-center justify-center'>
-        <span className='text-[13px] text-[var(--text-tertiary)]'>Loading table...</span>
-      </div>
-    )
-  }
-
-  if (!tableData) {
-    return (
-      <div className='flex h-full items-center justify-center'>
-        <span className='text-[13px] text-[var(--text-error)]'>Table not found</span>
-      </div>
-    )
-  }
-
-  return (
-    <div className='flex h-full flex-col'>
-      <TableToolbar
-        tableName={tableData.name}
-        totalCount={totalCount}
-        isLoading={isLoadingRows}
-        onNavigateBack={handleNavigateBack}
-        onShowSchema={handleShowSchema}
-        onRefresh={refetchRows}
-        showFilters={showFilters}
-        onToggleFilters={handleToggleFilters}
-        onAddRecord={addNewRow}
-        selectedCount={selectedCount}
-        onDeleteSelected={handleDeleteSelected}
-        onClearSelection={clearSelection}
-        hasPendingChanges={hasPendingChanges}
-        onSaveChanges={saveChanges}
-        onDiscardChanges={discardChanges}
-        isSaving={isSaving}
-        currentPage={currentPage}
-        totalPages={totalPages}
-        onPreviousPage={handlePreviousPage}
-        onNextPage={handleNextPage}
-      />
-
-      <FilterPanel
-        columns={columns}
-        isVisible={showFilters}
-        onApply={handleApplyQueryOptions}
-        onClose={() => setShowFilters(false)}
-        isLoading={isLoadingRows}
-      />
-
-      <div className='flex-1 overflow-auto'>
-        <Table>
-          <TableHeader className='sticky top-0 z-10 bg-[var(--surface-3)]'>
-            <TableRow>
-              <TableHead className='w-[40px]'>
-                <Checkbox size='sm' checked={isAllSelected} onCheckedChange={handleSelectAll} />
-              </TableHead>
-              {columns.map((column) => (
-                <TableHead key={column.name}>
-                  <div className='flex items-center gap-[6px]'>
-                    <span className='text-[12px]'>{column.name}</span>
-                    <Badge variant='outline' size='sm'>
-                      {column.type}
-                    </Badge>
-                    {column.required && (
-                      <span className='text-[10px] text-[var(--text-error)]'>*</span>
-                    )}
-                  </div>
-                </TableHead>
-              ))}
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {/* New rows being added */}
-            {newRows.map((newRow) => (
-              <EditableRow
-                key={newRow.tempId}
-                row={newRow}
-                columns={columns}
-                onUpdateCell={updateNewRowCell}
-                onRemove={handleRemoveNewRow}
-              />
-            ))}
-
-            {/* Loading state */}
-            {isLoadingRows ? (
-              <LoadingRows columns={columns} />
-            ) : rows.length === 0 && newRows.length === 0 ? (
-              <EmptyRows
-                columnCount={columns.length}
-                hasFilter={!!queryOptions.filter}
-                onAddRow={addNewRow}
-              />
-            ) : (
-              /* Existing rows with inline editing */
-              rows.map((row) => {
-                const rowChanges = pendingChanges.get(row.id)
-                const hasChanges = !!rowChanges
-
-                return (
-                  <TableRow
-                    key={row.id}
-                    className={cn(
-                      'group hover:bg-[var(--surface-4)]',
-                      selectedRows.has(row.id) && 'bg-[var(--surface-5)]',
-                      hasChanges && 'bg-amber-500/10'
-                    )}
-                    onContextMenu={(e) => handleRowContextMenu(e, row)}
-                  >
-                    <TableCell>
-                      <Checkbox
-                        size='sm'
-                        checked={selectedRows.has(row.id)}
-                        onCheckedChange={() => handleSelectRow(row.id)}
-                      />
-                    </TableCell>
-                    {columns.map((column) => {
-                      const currentValue = rowChanges?.[column.name] ?? row.data[column.name]
-
-                      return (
-                        <TableCell key={column.name}>
-                          <EditableCell
-                            value={currentValue}
-                            column={column}
-                            onChange={(value) => updateExistingRowCell(row.id, column.name, value)}
-                          />
-                        </TableCell>
-                      )
-                    })}
-                  </TableRow>
-                )
-              })
-            )}
-          </TableBody>
-        </Table>
-      </div>
-
-      {/* Delete confirmation modal */}
-      {deletingRows.length > 0 && (
-        <RowModal
-          mode='delete'
-          isOpen={true}
-          onClose={() => setDeletingRows([])}
-          table={tableData}
-          rowIds={deletingRows}
-          onSuccess={() => {
-            refetchRows()
-            setDeletingRows([])
-            clearSelection()
-          }}
-        />
-      )}
-
-      <SchemaModal
-        isOpen={showSchemaModal}
-        onClose={() => setShowSchemaModal(false)}
-        columns={columns}
-      />
-
-      <CellViewerModal
-        cellViewer={cellViewer}
-        onClose={() => setCellViewer(null)}
-        onCopy={handleCopyCellValue}
-        copied={copied}
-      />
-
-      <ContextMenu
-        contextMenu={contextMenu}
-        onClose={closeContextMenu}
-        onEdit={handleContextMenuEdit}
-        onDelete={handleContextMenuDelete}
-      />
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/index.ts

@@ -1,4 +0,0 @@
-export * from './use-context-menu'
-export * from './use-inline-editing'
-export * from './use-row-selection'
-export * from './use-table-data'

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-context-menu.ts

@@ -1,37 +0,0 @@
-import { useCallback, useState } from 'react'
-import type { TableRow } from '@/lib/table'
-import type { ContextMenuState } from '../lib/types'
-
-interface UseContextMenuReturn {
-  contextMenu: ContextMenuState
-  handleRowContextMenu: (e: React.MouseEvent, row: TableRow) => void
-  closeContextMenu: () => void
-}
-
-export function useContextMenu(): UseContextMenuReturn {
-  const [contextMenu, setContextMenu] = useState<ContextMenuState>({
-    isOpen: false,
-    position: { x: 0, y: 0 },
-    row: null,
-  })
-
-  const handleRowContextMenu = useCallback((e: React.MouseEvent, row: TableRow) => {
-    e.preventDefault()
-    e.stopPropagation()
-    setContextMenu({
-      isOpen: true,
-      position: { x: e.clientX, y: e.clientY },
-      row,
-    })
-  }, [])
-
-  const closeContextMenu = useCallback(() => {
-    setContextMenu((prev) => ({ ...prev, isOpen: false }))
-  }, [])
-
-  return {
-    contextMenu,
-    handleRowContextMenu,
-    closeContextMenu,
-  }
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-inline-editing.ts

@@ -1,192 +0,0 @@
-'use client'
-
-import { useCallback, useState } from 'react'
-import { createLogger } from '@sim/logger'
-import { nanoid } from 'nanoid'
-import type { ColumnDefinition } from '@/lib/table'
-
-const logger = createLogger('useInlineEditing')
-
-export interface TempRow {
-  tempId: string
-  data: Record<string, unknown>
-  isNew: true
-}
-
-interface UseInlineEditingProps {
-  workspaceId: string
-  tableId: string
-  columns: ColumnDefinition[]
-  onSuccess: () => void
-}
-
-interface UseInlineEditingReturn {
-  newRows: TempRow[]
-  pendingChanges: Map<string, Record<string, unknown>>
-  addNewRow: () => void
-  updateNewRowCell: (tempId: string, column: string, value: unknown) => void
-  updateExistingRowCell: (rowId: string, column: string, value: unknown) => void
-  saveChanges: () => Promise<void>
-  discardChanges: () => void
-  hasPendingChanges: boolean
-  isSaving: boolean
-  error: string | null
-}
-
-function createInitialRowData(columns: ColumnDefinition[]): Record<string, unknown> {
-  const initial: Record<string, unknown> = {}
-  columns.forEach((col) => {
-    if (col.type === 'boolean') {
-      initial[col.name] = false
-    } else {
-      initial[col.name] = null
-    }
-  })
-  return initial
-}
-
-function cleanRowData(
-  columns: ColumnDefinition[],
-  rowData: Record<string, unknown>
-): Record<string, unknown> {
-  const cleanData: Record<string, unknown> = {}
-
-  columns.forEach((col) => {
-    const value = rowData[col.name]
-    if (col.type === 'number') {
-      cleanData[col.name] = value === '' || value === null ? null : Number(value)
-    } else if (col.type === 'json') {
-      if (typeof value === 'string') {
-        if (value === '') {
-          cleanData[col.name] = null
-        } else {
-          try {
-            cleanData[col.name] = JSON.parse(value)
-          } catch {
-            throw new Error(`Invalid JSON for field: ${col.name}`)
-          }
-        }
-      } else {
-        cleanData[col.name] = value
-      }
-    } else if (col.type === 'boolean') {
-      cleanData[col.name] = Boolean(value)
-    } else {
-      cleanData[col.name] = value || null
-    }
-  })
-
-  return cleanData
-}
-
-export function useInlineEditing({
-  workspaceId,
-  tableId,
-  columns,
-  onSuccess,
-}: UseInlineEditingProps): UseInlineEditingReturn {
-  const [newRows, setNewRows] = useState<TempRow[]>([])
-  const [pendingChanges, setPendingChanges] = useState<Map<string, Record<string, unknown>>>(
-    new Map()
-  )
-  const [isSaving, setIsSaving] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-
-  const hasPendingChanges = newRows.length > 0 || pendingChanges.size > 0
-
-  const addNewRow = useCallback(() => {
-    const newRow: TempRow = {
-      tempId: `temp-${nanoid()}`,
-      data: createInitialRowData(columns),
-      isNew: true,
-    }
-    setNewRows((prev) => [newRow, ...prev])
-  }, [columns])
-
-  const updateNewRowCell = useCallback((tempId: string, column: string, value: unknown) => {
-    setNewRows((prev) =>
-      prev.map((row) =>
-        row.tempId === tempId ? { ...row, data: { ...row.data, [column]: value } } : row
-      )
-    )
-  }, [])
-
-  const updateExistingRowCell = useCallback((rowId: string, column: string, value: unknown) => {
-    setPendingChanges((prev) => {
-      const newMap = new Map(prev)
-      const existing = newMap.get(rowId) || {}
-      newMap.set(rowId, { ...existing, [column]: value })
-      return newMap
-    })
-  }, [])
-
-  const saveChanges = useCallback(async () => {
-    setIsSaving(true)
-    setError(null)
-
-    try {
-      // Save new rows
-      for (const newRow of newRows) {
-        const cleanData = cleanRowData(columns, newRow.data)
-
-        const res = await fetch(`/api/table/${tableId}/rows`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId, data: cleanData }),
-        })
-
-        const result: { error?: string } = await res.json()
-        if (!res.ok) {
-          throw new Error(result.error || 'Failed to add row')
-        }
-      }
-
-      // Save edited rows
-      for (const [rowId, changes] of pendingChanges.entries()) {
-        const cleanData = cleanRowData(columns, changes)
-
-        const res = await fetch(`/api/table/${tableId}/rows/${rowId}`, {
-          method: 'PATCH',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId, data: cleanData }),
-        })
-
-        const result: { error?: string } = await res.json()
-        if (!res.ok) {
-          throw new Error(result.error || 'Failed to update row')
-        }
-      }
-
-      // Clear state and refresh
-      setNewRows([])
-      setPendingChanges(new Map())
-      onSuccess()
-
-      logger.info('Changes saved successfully')
-    } catch (err) {
-      logger.error('Failed to save changes:', err)
-      setError(err instanceof Error ? err.message : 'Failed to save changes')
-    } finally {
-      setIsSaving(false)
-    }
-  }, [newRows, pendingChanges, columns, tableId, workspaceId, onSuccess])
-
-  const discardChanges = useCallback(() => {
-    setNewRows([])
-    setPendingChanges(new Map())
-    setError(null)
-  }, [])
-
-  return {
-    newRows,
-    pendingChanges,
-    addNewRow,
-    updateNewRowCell,
-    updateExistingRowCell,
-    saveChanges,
-    discardChanges,
-    hasPendingChanges,
-    isSaving,
-    error,
-  }
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-row-selection.ts

@@ -1,56 +0,0 @@
-import { useCallback, useEffect, useState } from 'react'
-import type { TableRow } from '@/lib/table'
-
-interface UseRowSelectionReturn {
-  selectedRows: Set<string>
-  handleSelectAll: () => void
-  handleSelectRow: (rowId: string) => void
-  clearSelection: () => void
-}
-
-export function useRowSelection(rows: TableRow[]): UseRowSelectionReturn {
-  const [selectedRows, setSelectedRows] = useState<Set<string>>(new Set())
-
-  useEffect(() => {
-    setSelectedRows((prev) => {
-      if (prev.size === 0) return prev
-
-      const currentRowIds = new Set(rows.map((r) => r.id))
-      const filtered = new Set([...prev].filter((id) => currentRowIds.has(id)))
-
-      // Only update state if something was actually filtered out
-      return filtered.size !== prev.size ? filtered : prev
-    })
-  }, [rows])
-
-  const handleSelectAll = useCallback(() => {
-    if (selectedRows.size === rows.length) {
-      setSelectedRows(new Set())
-    } else {
-      setSelectedRows(new Set(rows.map((r) => r.id)))
-    }
-  }, [rows, selectedRows.size])
-
-  const handleSelectRow = useCallback((rowId: string) => {
-    setSelectedRows((prev) => {
-      const newSet = new Set(prev)
-      if (newSet.has(rowId)) {
-        newSet.delete(rowId)
-      } else {
-        newSet.add(rowId)
-      }
-      return newSet
-    })
-  }, [])
-
-  const clearSelection = useCallback(() => {
-    setSelectedRows(new Set())
-  }, [])
-
-  return {
-    selectedRows,
-    handleSelectAll,
-    handleSelectRow,
-    clearSelection,
-  }
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table-data.ts

@@ -1,86 +0,0 @@
-import { useQuery } from '@tanstack/react-query'
-import type { TableDefinition, TableRow } from '@/lib/table'
-import { ROWS_PER_PAGE } from '../lib/constants'
-import type { QueryOptions } from '../lib/types'
-
-interface UseTableDataParams {
-  workspaceId: string
-  tableId: string
-  queryOptions: QueryOptions
-  currentPage: number
-}
-
-interface UseTableDataReturn {
-  tableData: TableDefinition | undefined
-  isLoadingTable: boolean
-  rows: TableRow[]
-  totalCount: number
-  totalPages: number
-  isLoadingRows: boolean
-  refetchRows: () => void
-}
-
-export function useTableData({
-  workspaceId,
-  tableId,
-  queryOptions,
-  currentPage,
-}: UseTableDataParams): UseTableDataReturn {
-  const { data: tableData, isLoading: isLoadingTable } = useQuery({
-    queryKey: ['table', tableId],
-    queryFn: async () => {
-      const res = await fetch(`/api/table/${tableId}?workspaceId=${workspaceId}`)
-      if (!res.ok) throw new Error('Failed to fetch table')
-      const json: { data?: { table: TableDefinition }; table?: TableDefinition } = await res.json()
-      const data = json.data || json
-      return (data as { table: TableDefinition }).table
-    },
-  })
-
-  const {
-    data: rowsData,
-    isLoading: isLoadingRows,
-    refetch: refetchRows,
-  } = useQuery({
-    queryKey: ['table-rows', tableId, queryOptions, currentPage],
-    queryFn: async () => {
-      const searchParams = new URLSearchParams({
-        workspaceId,
-        limit: String(ROWS_PER_PAGE),
-        offset: String(currentPage * ROWS_PER_PAGE),
-      })
-
-      if (queryOptions.filter) {
-        searchParams.set('filter', JSON.stringify(queryOptions.filter))
-      }
-
-      if (queryOptions.sort) {
-        searchParams.set('sort', JSON.stringify(queryOptions.sort))
-      }
-
-      const res = await fetch(`/api/table/${tableId}/rows?${searchParams}`)
-      if (!res.ok) throw new Error('Failed to fetch rows')
-      const json: {
-        data?: { rows: TableRow[]; totalCount: number }
-        rows?: TableRow[]
-        totalCount?: number
-      } = await res.json()
-      return json.data || json
-    },
-    enabled: !!tableData,
-  })
-
-  const rows = (rowsData?.rows || []) as TableRow[]
-  const totalCount = rowsData?.totalCount || 0
-  const totalPages = Math.ceil(totalCount / ROWS_PER_PAGE)
-
-  return {
-    tableData,
-    isLoadingTable,
-    rows,
-    totalCount,
-    totalPages,
-    isLoadingRows,
-    refetchRows,
-  }
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/lib/constants.ts

@@ -1,2 +0,0 @@
-export const ROWS_PER_PAGE = 100
-export const STRING_TRUNCATE_LENGTH = 50

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/lib/index.ts

@@ -1,3 +0,0 @@
-export * from './constants'
-export * from './types'
-export * from './utils'

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/lib/types.ts

@@ -1,27 +0,0 @@
-import type { Filter, Sort, TableRow } from '@/lib/table'
-
-/**
- * Query options for filtering and sorting table data
- */
-export interface QueryOptions {
-  filter: Filter | null
-  sort: Sort | null
-}
-
-/**
- * Data for viewing a cell's full content in a modal
- */
-export interface CellViewerData {
-  columnName: string
-  value: unknown
-  type: 'json' | 'text' | 'date' | 'boolean' | 'number'
-}
-
-/**
- * State for the row context menu (right-click)
- */
-export interface ContextMenuState {
-  isOpen: boolean
-  position: { x: number; y: number }
-  row: TableRow | null
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/lib/utils.ts

@@ -1,21 +0,0 @@
-type BadgeVariant = 'green' | 'blue' | 'purple' | 'orange' | 'teal' | 'gray'
-
-/**
- * Returns the appropriate badge color variant for a column type
- */
-export function getTypeBadgeVariant(type: string): BadgeVariant {
-  switch (type) {
-    case 'string':
-      return 'green'
-    case 'number':
-      return 'blue'
-    case 'boolean':
-      return 'purple'
-    case 'json':
-      return 'orange'
-    case 'date':
-      return 'teal'
-    default:
-      return 'gray'
-  }
-}

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/page.tsx

@@ -1,5 +0,0 @@
-import { TableViewer } from './components'
-
-export default function TablePage() {
-  return <TableViewer />
-}

apps/sim/app/workspace/[workspaceId]/tables/components/constants.ts

@@ -1,14 +0,0 @@
-export type SortOption = 'name' | 'createdAt' | 'updatedAt' | 'rowCount' | 'columnCount'
-export type SortOrder = 'asc' | 'desc'
-
-export const SORT_OPTIONS = [
-  { value: 'updatedAt-desc', label: 'Last Updated' },
-  { value: 'createdAt-desc', label: 'Newest First' },
-  { value: 'createdAt-asc', label: 'Oldest First' },
-  { value: 'name-asc', label: 'Name (A-Z)' },
-  { value: 'name-desc', label: 'Name (Z-A)' },
-  { value: 'rowCount-desc', label: 'Most Rows' },
-  { value: 'rowCount-asc', label: 'Least Rows' },
-  { value: 'columnCount-desc', label: 'Most Columns' },
-  { value: 'columnCount-asc', label: 'Least Columns' },
-] as const

apps/sim/app/workspace/[workspaceId]/tables/components/create-modal.tsx

@@ -1,349 +0,0 @@
-'use client'
-
-import { useMemo, useState } from 'react'
-import { createLogger } from '@sim/logger'
-import { Plus } from 'lucide-react'
-import { nanoid } from 'nanoid'
-import { useParams } from 'next/navigation'
-import {
-  Button,
-  Checkbox,
-  Combobox,
-  Input,
-  Label,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Textarea,
-  Tooltip,
-} from '@/components/emcn'
-import { Trash } from '@/components/emcn/icons/trash'
-import type { ColumnDefinition } from '@/lib/table'
-import { useCreateTable } from '@/hooks/queries/use-tables'
-
-const logger = createLogger('CreateModal')
-
-interface CreateModalProps {
-  isOpen: boolean
-  onClose: () => void
-}
-
-const COLUMN_TYPE_OPTIONS: Array<{ value: ColumnDefinition['type']; label: string }> = [
-  { value: 'string', label: 'String' },
-  { value: 'number', label: 'Number' },
-  { value: 'boolean', label: 'Boolean' },
-  { value: 'date', label: 'Date' },
-  { value: 'json', label: 'JSON' },
-]
-
-interface ColumnWithId extends ColumnDefinition {
-  id: string
-}
-
-function createEmptyColumn(): ColumnWithId {
-  return { id: nanoid(), name: '', type: 'string', required: true, unique: false }
-}
-
-export function CreateModal({ isOpen, onClose }: CreateModalProps) {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const [tableName, setTableName] = useState('')
-  const [description, setDescription] = useState('')
-  const [columns, setColumns] = useState<ColumnWithId[]>([createEmptyColumn()])
-  const [error, setError] = useState<string | null>(null)
-
-  const createTable = useCreateTable(workspaceId)
-
-  // Form validation
-  const validColumns = useMemo(() => columns.filter((col) => col.name.trim()), [columns])
-  const duplicateColumnNames = useMemo(() => {
-    const names = validColumns.map((col) => col.name.toLowerCase())
-    const seen = new Set<string>()
-    const duplicates = new Set<string>()
-    names.forEach((name) => {
-      if (seen.has(name)) {
-        duplicates.add(name)
-      }
-      seen.add(name)
-    })
-    return duplicates
-  }, [validColumns])
-
-  const isFormValid = useMemo(() => {
-    const hasTableName = tableName.trim().length > 0
-    const hasAtLeastOneColumn = validColumns.length > 0
-    const hasNoDuplicates = duplicateColumnNames.size === 0
-    return hasTableName && hasAtLeastOneColumn && hasNoDuplicates
-  }, [tableName, validColumns.length, duplicateColumnNames.size])
-
-  const handleAddColumn = () => {
-    setColumns([...columns, createEmptyColumn()])
-  }
-
-  const handleRemoveColumn = (columnId: string) => {
-    if (columns.length > 1) {
-      setColumns(columns.filter((col) => col.id !== columnId))
-    }
-  }
-
-  const handleColumnChange = (
-    columnId: string,
-    field: keyof ColumnDefinition,
-    value: string | boolean
-  ) => {
-    setColumns(columns.map((col) => (col.id === columnId ? { ...col, [field]: value } : col)))
-  }
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    setError(null)
-
-    if (!tableName.trim()) {
-      setError('Table name is required')
-      return
-    }
-
-    // Validate column names
-    const validColumns = columns.filter((col) => col.name.trim())
-    if (validColumns.length === 0) {
-      setError('At least one column is required')
-      return
-    }
-
-    // Check for duplicate column names
-    const columnNames = validColumns.map((col) => col.name.toLowerCase())
-    const uniqueNames = new Set(columnNames)
-    if (uniqueNames.size !== columnNames.length) {
-      setError('Duplicate column names found')
-      return
-    }
-
-    // Strip internal IDs before sending to API
-    const columnsForApi = validColumns.map(({ id: _id, ...col }) => col)
-
-    try {
-      await createTable.mutateAsync({
-        name: tableName,
-        description: description || undefined,
-        schema: {
-          columns: columnsForApi,
-        },
-      })
-
-      // Reset form
-      resetForm()
-      onClose()
-    } catch (err) {
-      logger.error('Failed to create table:', err)
-      setError(err instanceof Error ? err.message : 'Failed to create table')
-    }
-  }
-
-  const resetForm = () => {
-    setTableName('')
-    setDescription('')
-    setColumns([createEmptyColumn()])
-    setError(null)
-  }
-
-  const handleClose = () => {
-    resetForm()
-    onClose()
-  }
-
-  return (
-    <Modal open={isOpen} onOpenChange={handleClose}>
-      <ModalContent size='lg'>
-        <ModalHeader>Create New Table</ModalHeader>
-        <ModalBody className='max-h-[70vh] overflow-y-auto'>
-          <form onSubmit={handleSubmit} className='space-y-[12px]'>
-            {error && (
-              <div className='rounded-[4px] border border-destructive/30 bg-destructive/10 p-3 text-destructive text-sm'>
-                {error}
-              </div>
-            )}
-
-            {/* Table Name */}
-            <div>
-              <Label
-                htmlFor='tableName'
-                className='mb-[6.5px] block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'
-              >
-                Table Name
-              </Label>
-              <Input
-                id='tableName'
-                value={tableName}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTableName(e.target.value)}
-                placeholder='e.g., customer_orders'
-                className='h-9'
-              />
-            </div>
-
-            {/* Description */}
-            <div>
-              <Label
-                htmlFor='description'
-                className='mb-[6.5px] block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'
-              >
-                Description
-              </Label>
-              <Textarea
-                id='description'
-                value={description}
-                onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
-                  setDescription(e.target.value)
-                }
-                placeholder='Optional description for this table'
-                rows={2}
-                className='resize-none'
-              />
-            </div>
-
-            {/* Columns */}
-            <div>
-              <div className='mb-[6.5px] flex items-center justify-between pl-[2px]'>
-                <Label className='font-medium text-[13px] text-[var(--text-primary)]'>
-                  Columns
-                </Label>
-                <Button type='button' size='sm' variant='default' onClick={handleAddColumn}>
-                  <Plus className='mr-1 h-3.5 w-3.5' />
-                  Add
-                </Button>
-              </div>
-
-              {/* Column Headers */}
-              <div className='mb-2 flex items-center gap-[10px] text-[11px] text-[var(--text-secondary)]'>
-                <div className='flex-1 pl-3'>Name</div>
-                <div className='w-[110px] pl-3'>Type</div>
-                <Tooltip.Root>
-                  <Tooltip.Trigger asChild>
-                    <div className='w-[70px] cursor-help text-center'>Required</div>
-                  </Tooltip.Trigger>
-                  <Tooltip.Content>Field must have a value</Tooltip.Content>
-                </Tooltip.Root>
-                <Tooltip.Root>
-                  <Tooltip.Trigger asChild>
-                    <div className='w-[70px] cursor-help text-center'>Unique</div>
-                  </Tooltip.Trigger>
-                  <Tooltip.Content>No duplicate values allowed</Tooltip.Content>
-                </Tooltip.Root>
-                <div className='w-9' />
-              </div>
-
-              {/* Column Rows */}
-              <div className='flex flex-col gap-2'>
-                {columns.map((column) => (
-                  <ColumnRow
-                    key={column.id}
-                    column={column}
-                    isRemovable={columns.length > 1}
-                    isDuplicate={duplicateColumnNames.has(column.name.toLowerCase())}
-                    onChange={handleColumnChange}
-                    onRemove={handleRemoveColumn}
-                  />
-                ))}
-              </div>
-
-              <p className='mt-[6.5px] text-[11px] text-[var(--text-secondary)]'>
-                Mark columns as unique to prevent duplicate values (e.g., id, email)
-              </p>
-            </div>
-          </form>
-        </ModalBody>
-        <ModalFooter>
-          <Button variant='default' onClick={handleClose} disabled={createTable.isPending}>
-            Cancel
-          </Button>
-          <Button
-            variant='tertiary'
-            onClick={handleSubmit}
-            disabled={createTable.isPending || !isFormValid}
-          >
-            {createTable.isPending ? 'Creating...' : 'Create'}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  )
-}
-
-interface ColumnRowProps {
-  column: ColumnWithId
-  isRemovable: boolean
-  isDuplicate: boolean
-  onChange: (columnId: string, field: keyof ColumnDefinition, value: string | boolean) => void
-  onRemove: (columnId: string) => void
-}
-
-function ColumnRow({ column, isRemovable, isDuplicate, onChange, onRemove }: ColumnRowProps) {
-  return (
-    <div className='flex flex-col gap-1'>
-      <div className='flex items-center gap-[10px]'>
-        {/* Column Name */}
-        <div className='flex-1'>
-          <Input
-            value={column.name}
-            onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-              onChange(column.id, 'name', e.target.value)
-            }
-            placeholder='column_name'
-            className={`h-9 ${isDuplicate ? 'border-destructive focus-visible:ring-destructive' : ''}`}
-          />
-        </div>
-
-        {/* Column Type */}
-        <div className='w-[110px]'>
-          <Combobox
-            options={COLUMN_TYPE_OPTIONS}
-            value={column.type}
-            selectedValue={column.type}
-            onChange={(value) => onChange(column.id, 'type', value as ColumnDefinition['type'])}
-            placeholder='Type'
-            editable={false}
-            filterOptions={false}
-            className='h-9'
-          />
-        </div>
-
-        {/* Required Checkbox */}
-        <div className='flex w-[70px] items-center justify-center'>
-          <Checkbox
-            checked={column.required}
-            onCheckedChange={(checked) => onChange(column.id, 'required', checked === true)}
-          />
-        </div>
-
-        {/* Unique Checkbox */}
-        <div className='flex w-[70px] items-center justify-center'>
-          <Checkbox
-            checked={column.unique}
-            onCheckedChange={(checked) => onChange(column.id, 'unique', checked === true)}
-          />
-        </div>
-
-        {/* Delete Button */}
-        <div className='w-9'>
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <Button
-                type='button'
-                variant='ghost'
-                onClick={() => onRemove(column.id)}
-                disabled={!isRemovable}
-                className='h-9 w-9 p-0'
-              >
-                <Trash />
-              </Button>
-            </Tooltip.Trigger>
-            <Tooltip.Content>Remove column</Tooltip.Content>
-          </Tooltip.Root>
-        </div>
-      </div>
-      {isDuplicate && <p className='mt-1 pl-1 text-destructive text-sm'>Duplicate column name</p>}
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/empty-state.tsx

@@ -1,20 +0,0 @@
-interface EmptyStateProps {
-  hasSearchQuery: boolean
-}
-
-export function EmptyState({ hasSearchQuery }: EmptyStateProps) {
-  return (
-    <div className='col-span-full flex h-64 items-center justify-center rounded-lg border border-muted-foreground/25 bg-muted/20'>
-      <div className='text-center'>
-        <p className='font-medium text-[var(--text-secondary)] text-sm'>
-          {hasSearchQuery ? 'No tables found' : 'No tables yet'}
-        </p>
-        <p className='mt-1 text-[var(--text-muted)] text-xs'>
-          {hasSearchQuery
-            ? 'Try adjusting your search query'
-            : 'Create your first table to store structured data for your workflows'}
-        </p>
-      </div>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/error-state.tsx

@@ -1,15 +0,0 @@
-interface ErrorStateProps {
-  error: unknown
-}
-
-export function ErrorState({ error }: ErrorStateProps) {
-  return (
-    <div className='col-span-full flex h-64 items-center justify-center'>
-      <div className='text-[var(--text-error)]'>
-        <span className='text-[13px]'>
-          Error: {error instanceof Error ? error.message : 'Failed to load tables'}
-        </span>
-      </div>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/index.ts

@@ -1,8 +0,0 @@
-export * from './create-modal'
-export * from './empty-state'
-export * from './error-state'
-export * from './loading-state'
-export * from './table-card'
-export * from './table-card-context-menu'
-export * from './table-list-context-menu'
-export * from './tables-view'

apps/sim/app/workspace/[workspaceId]/tables/components/loading-state.tsx

@@ -1,31 +0,0 @@
-export function LoadingState() {
-  return (
-    <>
-      {Array.from({ length: 8 }).map((_, i) => (
-        <div
-          key={i}
-          className='flex h-full flex-col gap-[12px] rounded-[4px] bg-[var(--surface-3)] px-[8px] py-[6px] dark:bg-[var(--surface-4)]'
-        >
-          <div className='flex items-center justify-between gap-[8px]'>
-            <div className='h-[17px] w-[120px] animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-            <div className='h-[22px] w-[90px] animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-          </div>
-          <div className='flex flex-1 flex-col gap-[8px]'>
-            <div className='flex items-center justify-between'>
-              <div className='flex items-center gap-[12px]'>
-                <div className='h-[15px] w-[50px] animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-                <div className='h-[15px] w-[50px] animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-              </div>
-              <div className='h-[15px] w-[60px] animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-            </div>
-            <div className='h-0 w-full border-[var(--divider)] border-t' />
-            <div className='flex h-[36px] flex-col gap-[6px]'>
-              <div className='h-[15px] w-full animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-              <div className='h-[15px] w-[75%] animate-pulse rounded-[4px] bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
-            </div>
-          </div>
-        </div>
-      ))}
-    </>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/table-card-context-menu.tsx

@@ -1,152 +0,0 @@
-'use client'
-
-import {
-  Popover,
-  PopoverAnchor,
-  PopoverContent,
-  PopoverDivider,
-  PopoverItem,
-} from '@/components/emcn'
-
-interface TableCardContextMenuProps {
-  /**
-   * Whether the context menu is open
-   */
-  isOpen: boolean
-  /**
-   * Position of the context menu
-   */
-  position: { x: number; y: number }
-  /**
-   * Ref for the menu element
-   */
-  menuRef: React.RefObject<HTMLDivElement | null>
-  /**
-   * Callback when menu should close
-   */
-  onClose: () => void
-  /**
-   * Callback when open in new tab is clicked
-   */
-  onOpenInNewTab?: () => void
-  /**
-   * Callback when view schema is clicked
-   */
-  onViewSchema?: () => void
-  /**
-   * Callback when copy ID is clicked
-   */
-  onCopyId?: () => void
-  /**
-   * Callback when delete is clicked
-   */
-  onDelete?: () => void
-  /**
-   * Whether to show the open in new tab option
-   * @default true
-   */
-  showOpenInNewTab?: boolean
-  /**
-   * Whether to show the view schema option
-   * @default true
-   */
-  showViewSchema?: boolean
-  /**
-   * Whether to show the delete option
-   * @default true
-   */
-  showDelete?: boolean
-  /**
-   * Whether the delete option is disabled
-   * @default false
-   */
-  disableDelete?: boolean
-}
-
-/**
- * Context menu component for table cards.
- * Displays open in new tab, view schema, copy ID, and delete options in a popover at the right-click position.
- */
-export function TableCardContextMenu({
-  isOpen,
-  position,
-  menuRef,
-  onClose,
-  onOpenInNewTab,
-  onViewSchema,
-  onCopyId,
-  onDelete,
-  showOpenInNewTab = true,
-  showViewSchema = true,
-  showDelete = true,
-  disableDelete = false,
-}: TableCardContextMenuProps) {
-  return (
-    <Popover
-      open={isOpen}
-      onOpenChange={(open) => !open && onClose()}
-      variant='secondary'
-      size='sm'
-    >
-      <PopoverAnchor
-        style={{
-          position: 'fixed',
-          left: `${position.x}px`,
-          top: `${position.y}px`,
-          width: '1px',
-          height: '1px',
-        }}
-      />
-      <PopoverContent ref={menuRef} align='start' side='bottom' sideOffset={4}>
-        {/* Navigation */}
-        {showOpenInNewTab && onOpenInNewTab && (
-          <PopoverItem
-            onClick={() => {
-              onOpenInNewTab()
-              onClose()
-            }}
-          >
-            Open in new tab
-          </PopoverItem>
-        )}
-        {showOpenInNewTab && onOpenInNewTab && <PopoverDivider />}
-
-        {/* View and copy actions */}
-        {showViewSchema && onViewSchema && (
-          <PopoverItem
-            onClick={() => {
-              onViewSchema()
-              onClose()
-            }}
-          >
-            View schema
-          </PopoverItem>
-        )}
-        {onCopyId && (
-          <PopoverItem
-            onClick={() => {
-              onCopyId()
-              onClose()
-            }}
-          >
-            Copy ID
-          </PopoverItem>
-        )}
-        {((showViewSchema && onViewSchema) || onCopyId) && <PopoverDivider />}
-
-        {/* Destructive action */}
-        {showDelete && onDelete && (
-          <PopoverItem
-            disabled={disableDelete}
-            onClick={() => {
-              onDelete()
-              onClose()
-            }}
-          >
-            Delete
-          </PopoverItem>
-        )}
-      </PopoverContent>
-    </Popover>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/table-card.tsx

@@ -1,233 +0,0 @@
-'use client'
-
-import { useCallback, useRef, useState } from 'react'
-import { createLogger } from '@sim/logger'
-import { Columns, Rows3 } from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import {
-  Badge,
-  Button,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Tooltip,
-} from '@/components/emcn'
-import type { TableDefinition } from '@/lib/table'
-import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { SchemaModal } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/schema-modal'
-import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
-import { useDeleteTable } from '@/hooks/queries/use-tables'
-import { formatAbsoluteDate, formatRelativeTime } from '../lib/utils'
-import { TableCardContextMenu } from './table-card-context-menu'
-
-const logger = createLogger('TableCard')
-
-interface TableCardProps {
-  table: TableDefinition
-  workspaceId: string
-}
-
-export function TableCard({ table, workspaceId }: TableCardProps) {
-  const router = useRouter()
-  const userPermissions = useUserPermissionsContext()
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false)
-  const [isSchemaModalOpen, setIsSchemaModalOpen] = useState(false)
-  const menuButtonRef = useRef<HTMLButtonElement>(null)
-
-  const {
-    isOpen: isContextMenuOpen,
-    position: contextMenuPosition,
-    menuRef,
-    handleContextMenu,
-    closeMenu: closeContextMenu,
-  } = useContextMenu()
-
-  const handleMenuButtonClick = useCallback(
-    (e: React.MouseEvent) => {
-      e.stopPropagation()
-      if (menuButtonRef.current) {
-        const rect = menuButtonRef.current.getBoundingClientRect()
-        const syntheticEvent = {
-          preventDefault: () => {},
-          stopPropagation: () => {},
-          clientX: rect.right,
-          clientY: rect.bottom,
-        } as React.MouseEvent
-        handleContextMenu(syntheticEvent)
-      }
-    },
-    [handleContextMenu]
-  )
-
-  const deleteTable = useDeleteTable(workspaceId)
-
-  const handleDelete = async () => {
-    try {
-      await deleteTable.mutateAsync(table.id)
-      setIsDeleteDialogOpen(false)
-    } catch (error) {
-      logger.error('Failed to delete table:', error)
-    }
-  }
-
-  const navigateToTable = () => {
-    router.push(`/workspace/${workspaceId}/tables/${table.id}`)
-  }
-
-  const href = `/workspace/${workspaceId}/tables/${table.id}`
-
-  const handleClick = useCallback(
-    (e: React.MouseEvent) => {
-      if (isContextMenuOpen) {
-        e.preventDefault()
-        return
-      }
-      navigateToTable()
-    },
-    [isContextMenuOpen, navigateToTable]
-  )
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === 'Enter' || e.key === ' ') {
-        e.preventDefault()
-        navigateToTable()
-      }
-    },
-    [navigateToTable]
-  )
-
-  const handleOpenInNewTab = useCallback(() => {
-    window.open(href, '_blank')
-  }, [href])
-
-  const handleViewSchema = useCallback(() => {
-    setIsSchemaModalOpen(true)
-  }, [])
-
-  const handleCopyId = useCallback(() => {
-    navigator.clipboard.writeText(table.id)
-  }, [table.id])
-
-  const handleDeleteFromContextMenu = useCallback(() => {
-    setIsDeleteDialogOpen(true)
-  }, [])
-
-  const columnCount = table.schema.columns.length
-  const shortId = `tb-${table.id.slice(0, 8)}`
-
-  return (
-    <>
-      <div
-        role='button'
-        tabIndex={0}
-        data-table-card
-        className='h-full cursor-pointer'
-        onClick={handleClick}
-        onKeyDown={handleKeyDown}
-        onContextMenu={handleContextMenu}
-      >
-        <div className='group flex h-full flex-col gap-[12px] rounded-[4px] bg-[var(--surface-3)] px-[8px] py-[6px] transition-colors hover:bg-[var(--surface-4)] dark:bg-[var(--surface-4)] dark:hover:bg-[var(--surface-5)]'>
-          <div className='flex items-center justify-between gap-[8px]'>
-            <h3 className='min-w-0 flex-1 truncate font-medium text-[14px] text-[var(--text-primary)]'>
-              {table.name}
-            </h3>
-            <div className='flex items-center gap-[4px]'>
-              <Badge className='flex-shrink-0 rounded-[4px] text-[12px]'>{shortId}</Badge>
-              <Button
-                ref={menuButtonRef}
-                variant='ghost'
-                size='sm'
-                className='h-[20px] w-[20px] flex-shrink-0 p-0 text-[var(--text-tertiary)]'
-                onClick={handleMenuButtonClick}
-              >
-                <svg className='h-[14px] w-[14px]' viewBox='0 0 16 16' fill='currentColor'>
-                  <circle cx='3' cy='8' r='1.5' />
-                  <circle cx='8' cy='8' r='1.5' />
-                  <circle cx='13' cy='8' r='1.5' />
-                </svg>
-              </Button>
-            </div>
-          </div>
-
-          <div className='flex flex-1 flex-col gap-[8px]'>
-            <div className='flex items-center justify-between'>
-              <div className='flex items-center gap-[12px] text-[12px] text-[var(--text-tertiary)]'>
-                <span className='flex items-center gap-[4px]'>
-                  <Columns className='h-[12px] w-[12px]' />
-                  {columnCount} {columnCount === 1 ? 'col' : 'cols'}
-                </span>
-                <span className='flex items-center gap-[4px]'>
-                  <Rows3 className='h-[12px] w-[12px]' />
-                  {table.rowCount} {table.rowCount === 1 ? 'row' : 'rows'}
-                </span>
-              </div>
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <span className='text-[12px] text-[var(--text-tertiary)]'>
-                    last updated: {formatRelativeTime(table.updatedAt)}
-                  </span>
-                </Tooltip.Trigger>
-                <Tooltip.Content>{formatAbsoluteDate(table.updatedAt)}</Tooltip.Content>
-              </Tooltip.Root>
-            </div>
-
-            <div className='h-0 w-full border-[var(--divider)] border-t' />
-
-            <p className='line-clamp-2 h-[36px] text-[12px] text-[var(--text-tertiary)] leading-[18px]'>
-              {table.description || 'No description'}
-            </p>
-          </div>
-        </div>
-      </div>
-
-      {/* Delete Confirmation Modal */}
-      <Modal open={isDeleteDialogOpen} onOpenChange={setIsDeleteDialogOpen}>
-        <ModalContent size='sm'>
-          <ModalHeader>Delete Table</ModalHeader>
-          <ModalBody>
-            <p className='text-[12px] text-[var(--text-secondary)]'>
-              Are you sure you want to delete{' '}
-              <span className='font-medium text-[var(--text-primary)]'>{table.name}</span>? This
-              will permanently delete all {table.rowCount} rows.{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
-            </p>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              variant='default'
-              onClick={() => setIsDeleteDialogOpen(false)}
-              disabled={deleteTable.isPending}
-            >
-              Cancel
-            </Button>
-            <Button variant='destructive' onClick={handleDelete} disabled={deleteTable.isPending}>
-              {deleteTable.isPending ? 'Deleting...' : 'Delete'}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-
-      {/* Schema Viewer Modal */}
-      <SchemaModal
-        isOpen={isSchemaModalOpen}
-        onClose={() => setIsSchemaModalOpen(false)}
-        columns={table.schema.columns}
-      />
-
-      <TableCardContextMenu
-        isOpen={isContextMenuOpen}
-        position={contextMenuPosition}
-        menuRef={menuRef}
-        onClose={closeContextMenu}
-        onOpenInNewTab={handleOpenInNewTab}
-        onViewSchema={handleViewSchema}
-        onCopyId={handleCopyId}
-        onDelete={handleDeleteFromContextMenu}
-        disableDelete={userPermissions.canEdit !== true}
-      />
-    </>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/table-list-context-menu.tsx

@@ -1,76 +0,0 @@
-'use client'
-
-import { Popover, PopoverAnchor, PopoverContent, PopoverItem } from '@/components/emcn'
-
-interface TableListContextMenuProps {
-  /**
-   * Whether the context menu is open
-   */
-  isOpen: boolean
-  /**
-   * Position of the context menu
-   */
-  position: { x: number; y: number }
-  /**
-   * Ref for the menu element
-   */
-  menuRef: React.RefObject<HTMLDivElement | null>
-  /**
-   * Callback when menu should close
-   */
-  onClose: () => void
-  /**
-   * Callback when add table is clicked
-   */
-  onAddTable?: () => void
-  /**
-   * Whether the add option is disabled
-   * @default false
-   */
-  disableAdd?: boolean
-}
-
-/**
- * Context menu component for the tables list page.
- * Displays "Add table" option when right-clicking on empty space.
- */
-export function TableListContextMenu({
-  isOpen,
-  position,
-  menuRef,
-  onClose,
-  onAddTable,
-  disableAdd = false,
-}: TableListContextMenuProps) {
-  return (
-    <Popover
-      open={isOpen}
-      onOpenChange={(open) => !open && onClose()}
-      variant='secondary'
-      size='sm'
-    >
-      <PopoverAnchor
-        style={{
-          position: 'fixed',
-          left: `${position.x}px`,
-          top: `${position.y}px`,
-          width: '1px',
-          height: '1px',
-        }}
-      />
-      <PopoverContent ref={menuRef} align='start' side='bottom' sideOffset={4}>
-        {onAddTable && (
-          <PopoverItem
-            disabled={disableAdd}
-            onClick={() => {
-              onAddTable()
-              onClose()
-            }}
-          >
-            Add table
-          </PopoverItem>
-        )}
-      </PopoverContent>
-    </Popover>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/components/tables-view.tsx

@@ -1,197 +0,0 @@
-'use client'
-
-import { useCallback, useMemo, useState } from 'react'
-import { ChevronDown, Database, Search } from 'lucide-react'
-import { useParams } from 'next/navigation'
-import {
-  Button,
-  Input,
-  Popover,
-  PopoverContent,
-  PopoverItem,
-  PopoverTrigger,
-  Tooltip,
-} from '@/components/emcn'
-import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
-import { useTablesList } from '@/hooks/queries/use-tables'
-import { useDebounce } from '@/hooks/use-debounce'
-import { filterTables, sortTables } from '../lib/utils'
-import { SORT_OPTIONS, type SortOption, type SortOrder } from './constants'
-import { CreateModal } from './create-modal'
-import { EmptyState } from './empty-state'
-import { ErrorState } from './error-state'
-import { LoadingState } from './loading-state'
-import { TableCard } from './table-card'
-import { TableListContextMenu } from './table-list-context-menu'
-
-export function TablesView() {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-  const userPermissions = useUserPermissionsContext()
-
-  const { data: tables = [], isLoading, error } = useTablesList(workspaceId)
-
-  const [searchQuery, setSearchQuery] = useState('')
-  const debouncedSearchQuery = useDebounce(searchQuery, 300)
-  const [isCreateModalOpen, setIsCreateModalOpen] = useState(false)
-  const [isSortPopoverOpen, setIsSortPopoverOpen] = useState(false)
-  const [sortBy, setSortBy] = useState<SortOption>('updatedAt')
-  const [sortOrder, setSortOrder] = useState<SortOrder>('desc')
-
-  const {
-    isOpen: isListContextMenuOpen,
-    position: listContextMenuPosition,
-    menuRef: listMenuRef,
-    handleContextMenu: handleListContextMenu,
-    closeMenu: closeListContextMenu,
-  } = useContextMenu()
-
-  /**
-   * Handle context menu on the content area - only show menu when clicking on empty space
-   */
-  const handleContentContextMenu = useCallback(
-    (e: React.MouseEvent) => {
-      const target = e.target as HTMLElement
-      const isOnCard = target.closest('[data-table-card]')
-      const isOnInteractive = target.closest('button, input, a, [role="button"]')
-
-      if (!isOnCard && !isOnInteractive) {
-        handleListContextMenu(e)
-      }
-    },
-    [handleListContextMenu]
-  )
-
-  /**
-   * Handle add table from context menu
-   */
-  const handleAddTable = useCallback(() => {
-    setIsCreateModalOpen(true)
-  }, [])
-
-  const currentSortValue = `${sortBy}-${sortOrder}`
-  const currentSortLabel =
-    SORT_OPTIONS.find((opt) => opt.value === currentSortValue)?.label || 'Last Updated'
-
-  /**
-   * Handles sort option change from dropdown
-   */
-  const handleSortChange = (value: string) => {
-    const [field, order] = value.split('-') as [SortOption, SortOrder]
-    setSortBy(field)
-    setSortOrder(order)
-    setIsSortPopoverOpen(false)
-  }
-
-  /**
-   * Filter and sort tables based on search query and sort options
-   */
-  const filteredAndSortedTables = useMemo(() => {
-    const filtered = filterTables(tables, debouncedSearchQuery)
-    return sortTables(filtered, sortBy, sortOrder)
-  }, [tables, debouncedSearchQuery, sortBy, sortOrder])
-
-  return (
-    <>
-      <div className='flex h-full flex-1 flex-col'>
-        <div className='flex flex-1 overflow-hidden'>
-          <div
-            className='flex flex-1 flex-col overflow-auto bg-white px-[24px] pt-[28px] pb-[24px] dark:bg-[var(--bg)]'
-            onContextMenu={handleContentContextMenu}
-          >
-            <div>
-              <div className='flex items-start gap-[12px]'>
-                <div className='flex h-[26px] w-[26px] items-center justify-center rounded-[6px] border border-[#64748B] bg-[#F1F5F9] dark:border-[#334155] dark:bg-[#0F172A]'>
-                  <Database className='h-[14px] w-[14px] text-[#64748B] dark:text-[#CBD5E1]' />
-                </div>
-                <h1 className='font-medium text-[18px]'>Tables</h1>
-              </div>
-              <p className='mt-[10px] text-[14px] text-[var(--text-tertiary)]'>
-                Create and manage data tables for your workflows.
-              </p>
-            </div>
-
-            <div className='mt-[14px] flex items-center justify-between'>
-              <div className='flex h-[32px] w-[400px] items-center gap-[6px] rounded-[8px] bg-[var(--surface-4)] px-[8px]'>
-                <Search className='h-[14px] w-[14px] text-[var(--text-subtle)]' />
-                <Input
-                  placeholder='Search'
-                  value={searchQuery}
-                  onChange={(e) => setSearchQuery(e.target.value)}
-                  className='flex-1 border-0 bg-transparent px-0 font-medium text-[var(--text-secondary)] text-small leading-none placeholder:text-[var(--text-subtle)] focus-visible:ring-0 focus-visible:ring-offset-0'
-                />
-              </div>
-              <div className='flex items-center gap-[8px]'>
-                {tables.length > 0 && (
-                  <Popover open={isSortPopoverOpen} onOpenChange={setIsSortPopoverOpen}>
-                    <PopoverTrigger asChild>
-                      <Button variant='default' className='h-[32px] rounded-[6px]'>
-                        {currentSortLabel}
-                        <ChevronDown className='ml-2 h-4 w-4 text-muted-foreground' />
-                      </Button>
-                    </PopoverTrigger>
-                    <PopoverContent align='end' side='bottom' sideOffset={4}>
-                      <div className='flex flex-col gap-[2px]'>
-                        {SORT_OPTIONS.map((option) => (
-                          <PopoverItem
-                            key={option.value}
-                            active={currentSortValue === option.value}
-                            onClick={() => handleSortChange(option.value)}
-                          >
-                            {option.label}
-                          </PopoverItem>
-                        ))}
-                      </div>
-                    </PopoverContent>
-                  </Popover>
-                )}
-
-                <Tooltip.Root>
-                  <Tooltip.Trigger asChild>
-                    <Button
-                      onClick={() => setIsCreateModalOpen(true)}
-                      disabled={userPermissions.canEdit !== true}
-                      variant='tertiary'
-                      className='h-[32px] rounded-[6px]'
-                    >
-                      Create
-                    </Button>
-                  </Tooltip.Trigger>
-                  {userPermissions.canEdit !== true && (
-                    <Tooltip.Content>Write permission required to create tables</Tooltip.Content>
-                  )}
-                </Tooltip.Root>
-              </div>
-            </div>
-
-            <div className='mt-[24px] grid grid-cols-1 gap-[20px] md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4'>
-              {isLoading ? (
-                <LoadingState />
-              ) : filteredAndSortedTables.length === 0 ? (
-                <EmptyState hasSearchQuery={!!debouncedSearchQuery} />
-              ) : error ? (
-                <ErrorState error={error} />
-              ) : (
-                filteredAndSortedTables.map((table) => (
-                  <TableCard key={table.id} table={table} workspaceId={workspaceId} />
-                ))
-              )}
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <CreateModal isOpen={isCreateModalOpen} onClose={() => setIsCreateModalOpen(false)} />
-
-      <TableListContextMenu
-        isOpen={isListContextMenuOpen}
-        position={listContextMenuPosition}
-        menuRef={listMenuRef}
-        onClose={closeListContextMenu}
-        onAddTable={handleAddTable}
-        disableAdd={userPermissions.canEdit !== true}
-      />
-    </>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/layout.tsx

@@ -1,7 +0,0 @@
-export default function TablesLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <div className='flex h-full flex-1 flex-col overflow-hidden pl-[var(--sidebar-width)]'>
-      {children}
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/tables/lib/index.ts

@@ -1 +0,0 @@
-export * from './utils'

apps/sim/app/workspace/[workspaceId]/tables/lib/utils.ts

@@ -1,83 +0,0 @@
-import type { TableDefinition } from '@/lib/table'
-import type { SortOption, SortOrder } from '../components/constants'
-
-/**
- * Sort tables by the specified field and order
- */
-export function sortTables(
-  tables: TableDefinition[],
-  sortBy: SortOption,
-  sortOrder: SortOrder
-): TableDefinition[] {
-  return [...tables].sort((a, b) => {
-    let comparison = 0
-
-    switch (sortBy) {
-      case 'name':
-        comparison = a.name.localeCompare(b.name)
-        break
-      case 'createdAt':
-        comparison = new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
-        break
-      case 'updatedAt':
-        comparison = new Date(a.updatedAt).getTime() - new Date(b.updatedAt).getTime()
-        break
-      case 'rowCount':
-        comparison = a.rowCount - b.rowCount
-        break
-      case 'columnCount':
-        comparison = a.schema.columns.length - b.schema.columns.length
-        break
-    }
-
-    return sortOrder === 'asc' ? comparison : -comparison
-  })
-}
-
-/**
- * Filter tables by search query
- */
-export function filterTables(tables: TableDefinition[], searchQuery: string): TableDefinition[] {
-  if (!searchQuery.trim()) {
-    return tables
-  }
-
-  const query = searchQuery.toLowerCase()
-  return tables.filter(
-    (table) =>
-      table.name.toLowerCase().includes(query) || table.description?.toLowerCase().includes(query)
-  )
-}
-
-/**
- * Formats a date as relative time (e.g., "5m ago", "2d ago")
- */
-export function formatRelativeTime(dateValue: string | Date): string {
-  const dateString = typeof dateValue === 'string' ? dateValue : dateValue.toISOString()
-  const date = new Date(dateString)
-  const now = new Date()
-  const diffInSeconds = Math.floor((now.getTime() - date.getTime()) / 1000)
-
-  if (diffInSeconds < 60) return 'just now'
-  if (diffInSeconds < 3600) return `${Math.floor(diffInSeconds / 60)}m ago`
-  if (diffInSeconds < 86400) return `${Math.floor(diffInSeconds / 3600)}h ago`
-  if (diffInSeconds < 604800) return `${Math.floor(diffInSeconds / 86400)}d ago`
-  if (diffInSeconds < 2592000) return `${Math.floor(diffInSeconds / 604800)}w ago`
-  if (diffInSeconds < 31536000) return `${Math.floor(diffInSeconds / 2592000)}mo ago`
-  return `${Math.floor(diffInSeconds / 31536000)}y ago`
-}
-
-/**
- * Formats a date as absolute date string (e.g., "Jan 15, 2024, 10:30 AM")
- */
-export function formatAbsoluteDate(dateValue: string | Date): string {
-  const dateString = typeof dateValue === 'string' ? dateValue : dateValue.toISOString()
-  const date = new Date(dateString)
-  return date.toLocaleDateString('en-US', {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit',
-  })
-}

apps/sim/app/workspace/[workspaceId]/tables/page.tsx

@@ -1,26 +0,0 @@
-import { redirect } from 'next/navigation'
-import { getSession } from '@/lib/auth'
-import { verifyWorkspaceMembership } from '@/app/api/workflows/utils'
-import { TablesView } from './components'
-
-interface TablesPageProps {
-  params: Promise<{
-    workspaceId: string
-  }>
-}
-
-export default async function TablesPage({ params }: TablesPageProps) {
-  const { workspaceId } = await params
-  const session = await getSession()
-
-  if (!session?.user?.id) {
-    redirect('/')
-  }
-
-  const hasPermission = await verifyWorkspaceMembership(session.user.id, workspaceId)
-  if (!hasPermission) {
-    redirect('/')
-  }
-
-  return <TablesView />
-}

apps/sim/app/workspace/[workspaceId]/templates/templates.tsx

@@ -212,10 +212,8 @@ export default function Templates({
             ) : filteredTemplates.length === 0 ? (
               <div className='col-span-full flex h-64 items-center justify-center rounded-lg border border-muted-foreground/25 bg-muted/20'>
                 <div className='text-center'>
-                  <p className='font-medium text-[var(--text-secondary)] text-sm'>
-                    {emptyState.title}
-                  </p>
-                  <p className='mt-1 text-[var(--text-muted)] text-xs'>{emptyState.description}</p>
+                  <p className='font-medium text-muted-foreground text-sm'>{emptyState.title}</p>
+                  <p className='mt-1 text-muted-foreground/70 text-xs'>{emptyState.description}</p>
                 </div>
               </div>
             ) : (

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx

@@ -4,10 +4,10 @@ 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 { 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(

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

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx

@@ -35,9 +35,9 @@ import { WandPromptBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/comp
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
 import type { GenerationType } from '@/blocks/types'
-import { normalizeName } from '@/executor/constants'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useTagSelection } from '@/hooks/kb/use-tag-selection'
+import { normalizeName } from '@/stores/workflows/utils'
 
 const logger = createLogger('Code')
 
@@ -246,7 +246,6 @@ export const Code = memo(function Code({
       case 'json-schema':
         return 'Describe the JSON schema to generate...'
       case 'json-object':
-      case 'table-schema':
         return 'Describe the JSON object to generate...'
       default:
         return 'Describe the JavaScript code to generate...'
@@ -271,14 +270,9 @@ export const Code = memo(function Code({
     return wandConfig
   }, [wandConfig, languageValue])
 
-  const [tableIdValue] = useSubBlockValue<string>(blockId, 'tableId')
-
   const wandHook = useWand({
     wandConfig: dynamicWandConfig || { enabled: false, prompt: '' },
     currentValue: code,
-    contextParams: {
-      tableId: typeof tableIdValue === 'string' ? tableIdValue : null,
-    },
     onStreamStart: () => handleStreamStartRef.current?.(),
     onStreamChunk: (chunk: string) => handleStreamChunkRef.current?.(chunk),
     onGeneratedContent: (content: string) => handleGeneratedContentRef.current?.(content),

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx

@@ -1,7 +1,6 @@
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
 import { useReactFlow } from 'reactflow'
-import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
 import { cn } from '@/lib/core/utils/cn'
 import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
@@ -103,8 +102,7 @@ export const ComboBox = memo(function ComboBox({
     [blockConfig?.subBlocks]
   )
   const canonicalModeOverrides = blockState?.data?.canonicalModes
-  const dependencyValues = useStoreWithEqualityFn(
-    useSubBlockStore,
+  const dependencyValues = useSubBlockStore(
     useCallback(
       (state) => {
         if (dependsOnFields.length === 0 || !activeWorkflowId) return []

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx

@@ -32,9 +32,9 @@ import {
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
-import { normalizeName } from '@/executor/constants'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useTagSelection } from '@/hooks/kb/use-tag-selection'
+import { normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 const logger = createLogger('ConditionInput')

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx

@@ -1,6 +1,5 @@
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
-import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { Badge } from '@/components/emcn'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
 import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
@@ -101,8 +100,7 @@ export const Dropdown = memo(function Dropdown({
     [blockConfig?.subBlocks]
   )
   const canonicalModeOverrides = blockState?.data?.canonicalModes
-  const dependencyValues = useStoreWithEqualityFn(
-    useSubBlockStore,
+  const dependencyValues = useSubBlockStore(
     useCallback(
       (state) => {
         if (dependsOnFields.length === 0 || !activeWorkflowId) return []

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/empty-state.tsx

@@ -1,19 +0,0 @@
-import { Plus } from 'lucide-react'
-import { Button } from '@/components/emcn'
-
-interface EmptyStateProps {
-  onAdd: () => void
-  disabled: boolean
-  label: string
-}
-
-export function EmptyState({ onAdd, disabled, label }: EmptyStateProps) {
-  return (
-    <div className='flex items-center justify-center rounded-[4px] border border-[var(--border-1)] border-dashed py-[16px]'>
-      <Button variant='ghost' size='sm' onClick={onAdd} disabled={disabled}>
-        <Plus className='mr-[4px] h-[12px] w-[12px]' />
-        {label}
-      </Button>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx

@@ -1,137 +0,0 @@
-import { X } from 'lucide-react'
-import { Button, Combobox, type ComboboxOption, Input } from '@/components/emcn'
-import { cn } from '@/lib/core/utils/cn'
-import type { FilterRule } from '@/lib/table/query-builder/constants'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
-import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
-import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
-
-interface FilterRuleRowProps {
-  blockId: string
-  subBlockId: string
-  rule: FilterRule
-  index: number
-  columns: ComboboxOption[]
-  comparisonOptions: ComboboxOption[]
-  logicalOptions: ComboboxOption[]
-  isReadOnly: boolean
-  isPreview: boolean
-  disabled: boolean
-  onRemove: (id: string) => void
-  onUpdate: (id: string, field: keyof FilterRule, value: string) => void
-}
-
-export function FilterRuleRow({
-  blockId,
-  subBlockId,
-  rule,
-  index,
-  columns,
-  comparisonOptions,
-  logicalOptions,
-  isReadOnly,
-  isPreview,
-  disabled,
-  onRemove,
-  onUpdate,
-}: FilterRuleRowProps) {
-  const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
-
-  return (
-    <div className='flex items-center gap-[6px]'>
-      <Button
-        variant='ghost'
-        size='sm'
-        onClick={() => onRemove(rule.id)}
-        disabled={isReadOnly}
-        className='h-[24px] w-[24px] shrink-0 p-0 text-[var(--text-tertiary)] hover:text-[var(--text-primary)]'
-      >
-        <X className='h-[12px] w-[12px]' />
-      </Button>
-
-      <div className='w-[80px] shrink-0'>
-        {index === 0 ? (
-          <Combobox
-            size='sm'
-            options={[{ value: 'where', label: 'where' }]}
-            value='where'
-            disabled
-          />
-        ) : (
-          <Combobox
-            size='sm'
-            options={logicalOptions}
-            value={rule.logicalOperator}
-            onChange={(v) => onUpdate(rule.id, 'logicalOperator', v as 'and' | 'or')}
-            disabled={isReadOnly}
-          />
-        )}
-      </div>
-
-      <div className='w-[100px] shrink-0'>
-        <Combobox
-          size='sm'
-          options={columns}
-          value={rule.column}
-          onChange={(v) => onUpdate(rule.id, 'column', v)}
-          placeholder='Column'
-          disabled={isReadOnly}
-        />
-      </div>
-
-      <div className='w-[110px] shrink-0'>
-        <Combobox
-          size='sm'
-          options={comparisonOptions}
-          value={rule.operator}
-          onChange={(v) => onUpdate(rule.id, 'operator', v)}
-          disabled={isReadOnly}
-        />
-      </div>
-
-      <div className='relative min-w-[80px] flex-1'>
-        <SubBlockInputController
-          blockId={blockId}
-          subBlockId={`${subBlockId}_filter_${rule.id}`}
-          config={{ id: `filter_value_${rule.id}`, type: 'short-input' }}
-          value={rule.value}
-          onChange={(newValue) => onUpdate(rule.id, 'value', newValue)}
-          isPreview={isPreview}
-          disabled={disabled}
-        >
-          {({ ref, value: ctrlValue, onChange, onKeyDown, onDrop, onDragOver }) => {
-            const formattedText = formatDisplayText(ctrlValue, {
-              accessiblePrefixes,
-              highlightAll: !accessiblePrefixes,
-            })
-
-            return (
-              <div className='relative'>
-                <Input
-                  ref={ref as React.RefObject<HTMLInputElement>}
-                  className='h-[28px] w-full overflow-auto text-[12px] text-transparent caret-foreground [-ms-overflow-style:none] [scrollbar-width:none] placeholder:text-muted-foreground/50 [&::-webkit-scrollbar]:hidden'
-                  value={ctrlValue}
-                  onChange={onChange as (e: React.ChangeEvent<HTMLInputElement>) => void}
-                  onKeyDown={onKeyDown as (e: React.KeyboardEvent<HTMLInputElement>) => void}
-                  onDrop={onDrop as (e: React.DragEvent<HTMLInputElement>) => void}
-                  onDragOver={onDragOver as (e: React.DragEvent<HTMLInputElement>) => void}
-                  placeholder='Value'
-                  disabled={isReadOnly}
-                  autoComplete='off'
-                />
-                <div
-                  className={cn(
-                    'pointer-events-none absolute inset-0 flex items-center overflow-x-auto bg-transparent px-[8px] py-[6px] font-medium font-sans text-[12px] text-foreground [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden',
-                    (isPreview || disabled) && 'opacity-50'
-                  )}
-                >
-                  <div className='min-w-fit whitespace-pre'>{formattedText}</div>
-                </div>
-              </div>
-            )
-          }}
-        </SubBlockInputController>
-      </div>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx

@@ -1,90 +0,0 @@
-'use client'
-
-import { useMemo } from 'react'
-import { Plus } from 'lucide-react'
-import { Button } from '@/components/emcn'
-import { useTableColumns } from '@/lib/table/hooks'
-import type { FilterRule } from '@/lib/table/query-builder/constants'
-import { useFilterBuilder } from '@/lib/table/query-builder/use-query-builder'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { EmptyState } from './components/empty-state'
-import { FilterRuleRow } from './components/filter-rule-row'
-
-interface FilterBuilderProps {
-  blockId: string
-  subBlockId: string
-  isPreview?: boolean
-  previewValue?: FilterRule[] | null
-  disabled?: boolean
-  columns?: Array<{ value: string; label: string }>
-  tableIdSubBlockId?: string
-}
-
-/** Visual builder for table filter rules in workflow blocks. */
-export function FilterBuilder({
-  blockId,
-  subBlockId,
-  isPreview = false,
-  previewValue,
-  disabled = false,
-  columns: propColumns,
-  tableIdSubBlockId = 'tableId',
-}: FilterBuilderProps) {
-  const [storeValue, setStoreValue] = useSubBlockValue<FilterRule[]>(blockId, subBlockId)
-  const [tableIdValue] = useSubBlockValue<string>(blockId, tableIdSubBlockId)
-
-  const dynamicColumns = useTableColumns({ tableId: tableIdValue })
-  const columns = useMemo(() => {
-    if (propColumns && propColumns.length > 0) return propColumns
-    return dynamicColumns
-  }, [propColumns, dynamicColumns])
-
-  const value = isPreview ? previewValue : storeValue
-  const rules: FilterRule[] = Array.isArray(value) && value.length > 0 ? value : []
-  const isReadOnly = isPreview || disabled
-
-  const { comparisonOptions, logicalOptions, addRule, removeRule, updateRule } = useFilterBuilder({
-    columns,
-    rules,
-    setRules: setStoreValue,
-    isReadOnly,
-  })
-
-  return (
-    <div className='flex flex-col gap-[8px]'>
-      {rules.length === 0 ? (
-        <EmptyState onAdd={addRule} disabled={isReadOnly} label='Add filter rule' />
-      ) : (
-        <>
-          {rules.map((rule, index) => (
-            <FilterRuleRow
-              key={rule.id}
-              blockId={blockId}
-              subBlockId={subBlockId}
-              rule={rule}
-              index={index}
-              columns={columns}
-              comparisonOptions={comparisonOptions}
-              logicalOptions={logicalOptions}
-              isReadOnly={isReadOnly}
-              isPreview={isPreview}
-              disabled={disabled}
-              onRemove={removeRule}
-              onUpdate={updateRule}
-            />
-          ))}
-          <Button
-            variant='ghost'
-            size='sm'
-            onClick={addRule}
-            disabled={isReadOnly}
-            className='self-start'
-          >
-            <Plus className='mr-[4px] h-[12px] w-[12px]' />
-            Add rule
-          </Button>
-        </>
-      )}
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text.tsx

@@ -2,8 +2,9 @@
 
 import type { ReactNode } from 'react'
 import { splitReferenceSegment } from '@/lib/workflows/sanitization/references'
-import { normalizeName, REFERENCE } from '@/executor/constants'
+import { REFERENCE } from '@/executor/constants'
 import { createCombinedPattern } from '@/executor/utils/reference-validation'
+import { normalizeName } from '@/stores/workflows/utils'
 
 export interface HighlightContext {
   accessiblePrefixes?: Set<string>

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts

@@ -9,7 +9,6 @@ export { Dropdown } from './dropdown/dropdown'
 export { EvalInput } from './eval-input/eval-input'
 export { FileSelectorInput } from './file-selector/file-selector-input'
 export { FileUpload } from './file-upload/file-upload'
-export { FilterBuilder } from './filter-builder/filter-builder'
 export { FolderSelectorInput } from './folder-selector/components/folder-selector-input'
 export { GroupedCheckboxList } from './grouped-checkbox-list/grouped-checkbox-list'
 export { InputMapping } from './input-mapping/input-mapping'
@@ -27,12 +26,10 @@ export { SheetSelectorInput } from './sheet-selector/sheet-selector-input'
 export { ShortInput } from './short-input/short-input'
 export { SlackSelectorInput } from './slack-selector/slack-selector-input'
 export { SliderInput } from './slider-input/slider-input'
-export { SortBuilder } from './sort-builder/sort-builder'
 export { InputFormat } from './starter/input-format'
 export { SubBlockInputController } from './sub-block-input-controller'
 export { Switch } from './switch/switch'
 export { Table } from './table/table'
-export { TableSelector } from './table-selector/table-selector'
 export { Text } from './text/text'
 export { TimeInput } from './time-input/time-input'
 export { ToolInput } from './tool-input/tool-input'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx

@@ -1,12 +1,4 @@
-import {
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
+import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
 import { ChevronDown, ChevronsUpDown, ChevronUp, Plus } from 'lucide-react'
 import { Button, Popover, PopoverContent, PopoverItem, PopoverTrigger } from '@/components/emcn'
@@ -390,137 +382,92 @@ export function MessagesInput({
     textareaRefs.current[fieldId]?.focus()
   }, [])
 
-  const syncOverlay = useCallback((fieldId: string) => {
+  const autoResizeTextarea = useCallback((fieldId: string) => {
     const textarea = textareaRefs.current[fieldId]
+    if (!textarea) return
     const overlay = overlayRefs.current[fieldId]
-    if (!textarea || !overlay) return
 
-    overlay.style.width = `${textarea.clientWidth}px`
-    overlay.scrollTop = textarea.scrollTop
-    overlay.scrollLeft = textarea.scrollLeft
+    // If user has manually resized, respect their chosen height and only sync overlay.
+    if (userResizedRef.current[fieldId]) {
+      const currentHeight =
+        textarea.offsetHeight || Number.parseFloat(textarea.style.height) || MIN_TEXTAREA_HEIGHT_PX
+      const clampedHeight = Math.max(MIN_TEXTAREA_HEIGHT_PX, currentHeight)
+      textarea.style.height = `${clampedHeight}px`
+      if (overlay) {
+        overlay.style.height = `${clampedHeight}px`
+      }
+      return
+    }
+
+    textarea.style.height = 'auto'
+    const naturalHeight = textarea.scrollHeight || MIN_TEXTAREA_HEIGHT_PX
+    const nextHeight = Math.min(
+      MAX_TEXTAREA_HEIGHT_PX,
+      Math.max(MIN_TEXTAREA_HEIGHT_PX, naturalHeight)
+    )
+    textarea.style.height = `${nextHeight}px`
+
+    if (overlay) {
+      overlay.style.height = `${nextHeight}px`
+    }
   }, [])
 
-  const autoResizeTextarea = useCallback(
-    (fieldId: string) => {
-      const textarea = textareaRefs.current[fieldId]
-      const overlay = overlayRefs.current[fieldId]
-      if (!textarea) return
+  const handleResizeStart = useCallback((fieldId: string, e: React.MouseEvent<HTMLDivElement>) => {
+    e.preventDefault()
+    e.stopPropagation()
 
-      if (!textarea.value.trim()) {
-        userResizedRef.current[fieldId] = false
+    const textarea = textareaRefs.current[fieldId]
+    if (!textarea) return
+
+    const startHeight = textarea.offsetHeight || textarea.scrollHeight || MIN_TEXTAREA_HEIGHT_PX
+
+    isResizingRef.current = true
+    resizeStateRef.current = {
+      fieldId,
+      startY: e.clientY,
+      startHeight,
+    }
+
+    const handleMouseMove = (moveEvent: MouseEvent) => {
+      if (!isResizingRef.current || !resizeStateRef.current) return
+
+      const { fieldId: activeFieldId, startY, startHeight } = resizeStateRef.current
+      const deltaY = moveEvent.clientY - startY
+      const nextHeight = Math.max(MIN_TEXTAREA_HEIGHT_PX, startHeight + deltaY)
+
+      const activeTextarea = textareaRefs.current[activeFieldId]
+      if (activeTextarea) {
+        activeTextarea.style.height = `${nextHeight}px`
       }
 
-      if (userResizedRef.current[fieldId]) {
-        if (overlay) {
-          overlay.style.height = `${textarea.offsetHeight}px`
-        }
-        syncOverlay(fieldId)
-        return
-      }
-
-      textarea.style.height = 'auto'
-      const scrollHeight = textarea.scrollHeight
-      const height = Math.min(
-        MAX_TEXTAREA_HEIGHT_PX,
-        Math.max(MIN_TEXTAREA_HEIGHT_PX, scrollHeight)
-      )
-
-      textarea.style.height = `${height}px`
+      const overlay = overlayRefs.current[activeFieldId]
       if (overlay) {
-        overlay.style.height = `${height}px`
+        overlay.style.height = `${nextHeight}px`
+      }
+    }
+
+    const handleMouseUp = () => {
+      if (resizeStateRef.current) {
+        const { fieldId: activeFieldId } = resizeStateRef.current
+        userResizedRef.current[activeFieldId] = true
       }
 
-      syncOverlay(fieldId)
-    },
-    [syncOverlay]
-  )
+      isResizingRef.current = false
+      resizeStateRef.current = null
+      document.removeEventListener('mousemove', handleMouseMove)
+      document.removeEventListener('mouseup', handleMouseUp)
+    }
 
-  const handleResizeStart = useCallback(
-    (fieldId: string, e: React.MouseEvent<HTMLDivElement>) => {
-      e.preventDefault()
-      e.stopPropagation()
-
-      const textarea = textareaRefs.current[fieldId]
-      if (!textarea) return
-
-      const startHeight = textarea.offsetHeight || textarea.scrollHeight || MIN_TEXTAREA_HEIGHT_PX
-
-      isResizingRef.current = true
-      resizeStateRef.current = {
-        fieldId,
-        startY: e.clientY,
-        startHeight,
-      }
-
-      const handleMouseMove = (moveEvent: MouseEvent) => {
-        if (!isResizingRef.current || !resizeStateRef.current) return
-
-        const { fieldId: activeFieldId, startY, startHeight } = resizeStateRef.current
-        const deltaY = moveEvent.clientY - startY
-        const nextHeight = Math.max(MIN_TEXTAREA_HEIGHT_PX, startHeight + deltaY)
-
-        const activeTextarea = textareaRefs.current[activeFieldId]
-        const overlay = overlayRefs.current[activeFieldId]
-
-        if (activeTextarea) {
-          activeTextarea.style.height = `${nextHeight}px`
-        }
-
-        if (overlay) {
-          overlay.style.height = `${nextHeight}px`
-          if (activeTextarea) {
-            overlay.scrollTop = activeTextarea.scrollTop
-            overlay.scrollLeft = activeTextarea.scrollLeft
-          }
-        }
-      }
-
-      const handleMouseUp = () => {
-        if (resizeStateRef.current) {
-          const { fieldId: activeFieldId } = resizeStateRef.current
-          userResizedRef.current[activeFieldId] = true
-          syncOverlay(activeFieldId)
-        }
-
-        isResizingRef.current = false
-        resizeStateRef.current = null
-        document.removeEventListener('mousemove', handleMouseMove)
-        document.removeEventListener('mouseup', handleMouseUp)
-      }
-
-      document.addEventListener('mousemove', handleMouseMove)
-      document.addEventListener('mouseup', handleMouseUp)
-    },
-    [syncOverlay]
-  )
-
-  useLayoutEffect(() => {
-    currentMessages.forEach((_, index) => {
-      autoResizeTextarea(`message-${index}`)
-    })
-  }, [currentMessages, autoResizeTextarea])
+    document.addEventListener('mousemove', handleMouseMove)
+    document.addEventListener('mouseup', handleMouseUp)
+  }, [])
 
   useEffect(() => {
-    const observers: ResizeObserver[] = []
-
-    for (let i = 0; i < currentMessages.length; i++) {
-      const fieldId = `message-${i}`
-      const textarea = textareaRefs.current[fieldId]
-      const overlay = overlayRefs.current[fieldId]
-
-      if (textarea && overlay) {
-        const observer = new ResizeObserver(() => {
-          overlay.style.width = `${textarea.clientWidth}px`
-        })
-        observer.observe(textarea)
-        observers.push(observer)
-      }
-    }
-
-    return () => {
-      observers.forEach((observer) => observer.disconnect())
-    }
-  }, [currentMessages.length])
+    currentMessages.forEach((_, index) => {
+      const fieldId = `message-${index}`
+      autoResizeTextarea(fieldId)
+    })
+  }, [currentMessages, autoResizeTextarea])
 
   return (
     <div className='flex w-full flex-col gap-[10px]'>
@@ -674,15 +621,19 @@ export function MessagesInput({
                 </div>
 
                 {/* Content Input with overlay for variable highlighting */}
-                <div className='relative w-full overflow-hidden'>
+                <div className='relative w-full'>
                   <textarea
                     ref={(el) => {
                       textareaRefs.current[fieldId] = el
                     }}
-                    className='relative z-[2] m-0 box-border h-auto min-h-[80px] w-full resize-none overflow-y-auto overflow-x-hidden whitespace-pre-wrap break-words border-none bg-transparent px-[8px] py-[8px] font-medium font-sans text-sm text-transparent leading-[1.5] caret-[var(--text-primary)] outline-none [-ms-overflow-style:none] [scrollbar-width:none] placeholder:text-[var(--text-muted)] focus:outline-none focus-visible:outline-none disabled:cursor-not-allowed [&::-webkit-scrollbar]:hidden'
+                    className='allow-scroll box-border min-h-[80px] w-full resize-none whitespace-pre-wrap break-words border-none bg-transparent px-[8px] pt-[8px] font-[inherit] font-medium text-sm text-transparent leading-[inherit] caret-[var(--text-primary)] outline-none placeholder:text-[var(--text-muted)] focus:outline-none focus-visible:outline-none disabled:cursor-not-allowed'
+                    rows={3}
                     placeholder='Enter message content...'
                     value={message.content}
-                    onChange={fieldHandlers.onChange}
+                    onChange={(e) => {
+                      fieldHandlers.onChange(e)
+                      autoResizeTextarea(fieldId)
+                    }}
                     onKeyDown={(e) => {
                       if (e.key === 'Tab' && !isPreview && !disabled) {
                         e.preventDefault()
@@ -719,13 +670,12 @@ export function MessagesInput({
                     ref={(el) => {
                       overlayRefs.current[fieldId] = el
                     }}
-                    className='pointer-events-none absolute top-0 left-0 z-[1] m-0 box-border w-full overflow-y-auto overflow-x-hidden whitespace-pre-wrap break-words border-none bg-transparent px-[8px] py-[8px] font-medium font-sans text-[var(--text-primary)] text-sm leading-[1.5] [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden'
+                    className='scrollbar-none pointer-events-none absolute top-0 left-0 box-border w-full overflow-auto whitespace-pre-wrap break-words border-none bg-transparent px-[8px] pt-[8px] font-[inherit] font-medium text-[var(--text-primary)] text-sm leading-[inherit]'
                   >
                     {formatDisplayText(message.content, {
                       accessiblePrefixes,
                       highlightAll: !accessiblePrefixes,
                     })}
-                    {message.content.endsWith('\n') && '\u200B'}
                   </div>
 
                   {/* Env var dropdown for this message */}
@@ -755,7 +705,7 @@ export function MessagesInput({
 
                   {!isPreview && !disabled && (
                     <div
-                      className='absolute right-1 bottom-1 z-[3] flex h-4 w-4 cursor-ns-resize items-center justify-center rounded-[4px] border border-[var(--border-1)] bg-[var(--surface-5)] dark:bg-[var(--surface-5)]'
+                      className='absolute right-1 bottom-1 flex h-4 w-4 cursor-ns-resize items-center justify-center rounded-[4px] border border-[var(--border-1)] bg-[var(--surface-5)] dark:bg-[var(--surface-5)]'
                       onMouseDown={(e) => handleResizeStart(fieldId, e)}
                       onDragStart={(e) => {
                         e.preventDefault()

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/empty-state.tsx

@@ -1,19 +0,0 @@
-import { Plus } from 'lucide-react'
-import { Button } from '@/components/emcn'
-
-interface EmptyStateProps {
-  onAdd: () => void
-  disabled: boolean
-  label: string
-}
-
-export function EmptyState({ onAdd, disabled, label }: EmptyStateProps) {
-  return (
-    <div className='flex items-center justify-center rounded-[4px] border border-[var(--border-1)] border-dashed py-[16px]'>
-      <Button variant='ghost' size='sm' onClick={onAdd} disabled={disabled}>
-        <Plus className='mr-[4px] h-[12px] w-[12px]' />
-        {label}
-      </Button>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx

@@ -1,67 +0,0 @@
-import { X } from 'lucide-react'
-import { Button, Combobox, type ComboboxOption } from '@/components/emcn'
-import type { SortRule } from '@/lib/table/query-builder/constants'
-
-interface SortRuleRowProps {
-  rule: SortRule
-  index: number
-  columns: ComboboxOption[]
-  directionOptions: ComboboxOption[]
-  isReadOnly: boolean
-  onRemove: (id: string) => void
-  onUpdate: (id: string, field: keyof SortRule, value: string) => void
-}
-
-export function SortRuleRow({
-  rule,
-  index,
-  columns,
-  directionOptions,
-  isReadOnly,
-  onRemove,
-  onUpdate,
-}: SortRuleRowProps) {
-  return (
-    <div className='flex items-center gap-[6px]'>
-      <Button
-        variant='ghost'
-        size='sm'
-        onClick={() => onRemove(rule.id)}
-        disabled={isReadOnly}
-        className='h-[24px] w-[24px] shrink-0 p-0 text-[var(--text-tertiary)] hover:text-[var(--text-primary)]'
-      >
-        <X className='h-[12px] w-[12px]' />
-      </Button>
-
-      <div className='w-[90px] shrink-0'>
-        <Combobox
-          size='sm'
-          options={[{ value: String(index + 1), label: index === 0 ? 'order by' : 'then by' }]}
-          value={String(index + 1)}
-          disabled
-        />
-      </div>
-
-      <div className='min-w-[120px] flex-1'>
-        <Combobox
-          size='sm'
-          options={columns}
-          value={rule.column}
-          onChange={(v) => onUpdate(rule.id, 'column', v)}
-          placeholder='Column'
-          disabled={isReadOnly}
-        />
-      </div>
-
-      <div className='w-[110px] shrink-0'>
-        <Combobox
-          size='sm'
-          options={directionOptions}
-          value={rule.direction}
-          onChange={(v) => onUpdate(rule.id, 'direction', v as 'asc' | 'desc')}
-          disabled={isReadOnly}
-        />
-      </div>
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx

@@ -1,110 +0,0 @@
-'use client'
-
-import { useCallback, useMemo } from 'react'
-import { Plus } from 'lucide-react'
-import { nanoid } from 'nanoid'
-import { Button, type ComboboxOption } from '@/components/emcn'
-import { useTableColumns } from '@/lib/table/hooks'
-import { SORT_DIRECTIONS, type SortRule } from '@/lib/table/query-builder/constants'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { EmptyState } from './components/empty-state'
-import { SortRuleRow } from './components/sort-rule-row'
-
-interface SortBuilderProps {
-  blockId: string
-  subBlockId: string
-  isPreview?: boolean
-  previewValue?: SortRule[] | null
-  disabled?: boolean
-  columns?: Array<{ value: string; label: string }>
-  tableIdSubBlockId?: string
-}
-
-const createDefaultRule = (columns: ComboboxOption[]): SortRule => ({
-  id: nanoid(),
-  column: columns[0]?.value || '',
-  direction: 'asc',
-})
-
-/** Visual builder for table sort rules in workflow blocks. */
-export function SortBuilder({
-  blockId,
-  subBlockId,
-  isPreview = false,
-  previewValue,
-  disabled = false,
-  columns: propColumns,
-  tableIdSubBlockId = 'tableId',
-}: SortBuilderProps) {
-  const [storeValue, setStoreValue] = useSubBlockValue<SortRule[]>(blockId, subBlockId)
-  const [tableIdValue] = useSubBlockValue<string>(blockId, tableIdSubBlockId)
-
-  const dynamicColumns = useTableColumns({ tableId: tableIdValue, includeBuiltIn: true })
-  const columns = useMemo(() => {
-    if (propColumns && propColumns.length > 0) return propColumns
-    return dynamicColumns
-  }, [propColumns, dynamicColumns])
-
-  const directionOptions = useMemo(
-    () => SORT_DIRECTIONS.map((dir) => ({ value: dir.value, label: dir.label })),
-    []
-  )
-
-  const value = isPreview ? previewValue : storeValue
-  const rules: SortRule[] = Array.isArray(value) && value.length > 0 ? value : []
-  const isReadOnly = isPreview || disabled
-
-  const addRule = useCallback(() => {
-    if (isReadOnly) return
-    setStoreValue([...rules, createDefaultRule(columns)])
-  }, [isReadOnly, rules, columns, setStoreValue])
-
-  const removeRule = useCallback(
-    (id: string) => {
-      if (isReadOnly) return
-      setStoreValue(rules.filter((r) => r.id !== id))
-    },
-    [isReadOnly, rules, setStoreValue]
-  )
-
-  const updateRule = useCallback(
-    (id: string, field: keyof SortRule, newValue: string) => {
-      if (isReadOnly) return
-      setStoreValue(rules.map((r) => (r.id === id ? { ...r, [field]: newValue } : r)))
-    },
-    [isReadOnly, rules, setStoreValue]
-  )
-
-  return (
-    <div className='flex flex-col gap-[8px]'>
-      {rules.length === 0 ? (
-        <EmptyState onAdd={addRule} disabled={isReadOnly} label='Add sort rule' />
-      ) : (
-        <>
-          {rules.map((rule, index) => (
-            <SortRuleRow
-              key={rule.id}
-              rule={rule}
-              index={index}
-              columns={columns}
-              directionOptions={directionOptions}
-              isReadOnly={isReadOnly}
-              onRemove={removeRule}
-              onUpdate={updateRule}
-            />
-          ))}
-          <Button
-            variant='ghost'
-            size='sm'
-            onClick={addRule}
-            disabled={isReadOnly}
-            className='self-start'
-          >
-            <Plus className='mr-[4px] h-[12px] w-[12px]' />
-            Add sort
-          </Button>
-        </>
-      )}
-    </div>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table-selector/table-selector.tsx

@@ -1,80 +0,0 @@
-'use client'
-
-import { useCallback, useMemo } from 'react'
-import { useParams } from 'next/navigation'
-import { Combobox, type ComboboxOption } from '@/components/emcn'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import type { SubBlockConfig } from '@/blocks/types'
-import { useTablesList } from '@/hooks/queries/use-tables'
-
-interface TableSelectorProps {
-  blockId: string
-  subBlock: SubBlockConfig
-  disabled?: boolean
-  isPreview?: boolean
-  previewValue?: string | null
-}
-
-/**
- * Table selector component for selecting workspace tables
- *
- * @remarks
- * Provides a combobox to select workspace tables.
- * Uses React Query for efficient data fetching and caching.
- * The external link to navigate to the table is shown in the label area.
- */
-export function TableSelector({
-  blockId,
-  subBlock,
-  disabled = false,
-  isPreview = false,
-  previewValue,
-}: TableSelectorProps) {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const [storeValue, setStoreValue] = useSubBlockValue<string>(blockId, subBlock.id)
-
-  // Use React Query hook for table data - it handles caching, loading, and error states
-  const {
-    data: tables = [],
-    isLoading,
-    error,
-  } = useTablesList(isPreview || disabled ? undefined : workspaceId)
-
-  const value = isPreview ? previewValue : storeValue
-  const tableId = typeof value === 'string' ? value : null
-
-  const options = useMemo<ComboboxOption[]>(() => {
-    return tables.map((table) => ({
-      label: table.name.toLowerCase(),
-      value: table.id,
-    }))
-  }, [tables])
-
-  const handleChange = useCallback(
-    (selectedValue: string) => {
-      if (isPreview || disabled) return
-      setStoreValue(selectedValue)
-    },
-    [isPreview, disabled, setStoreValue]
-  )
-
-  // Convert error object to string if needed
-  const errorMessage = error instanceof Error ? error.message : error ? String(error) : undefined
-
-  return (
-    <Combobox
-      options={options}
-      value={tableId ?? undefined}
-      onChange={handleChange}
-      placeholder={subBlock.placeholder || 'Select a table'}
-      disabled={disabled || isPreview}
-      editable={false}
-      isLoading={isLoading}
-      error={errorMessage}
-      searchable={options.length > 5}
-      searchPlaceholder='Search...'
-    />
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx

@@ -19,11 +19,11 @@ interface TableProps {
   subBlockId: string
   columns: string[]
   isPreview?: boolean
-  previewValue?: WorkflowTableRow[] | null
+  previewValue?: TableRow[] | null
   disabled?: boolean
 }
 
-interface WorkflowTableRow {
+interface TableRow {
   id: string
   cells: Record<string, string>
 }
@@ -38,7 +38,7 @@ export function Table({
 }: TableProps) {
   const params = useParams()
   const workspaceId = params.workspaceId as string
-  const [storeValue, setStoreValue] = useSubBlockValue<WorkflowTableRow[]>(blockId, subBlockId)
+  const [storeValue, setStoreValue] = useSubBlockValue<TableRow[]>(blockId, subBlockId)
   const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
 
   // Use the extended hook for field-level management
@@ -73,7 +73,7 @@ export function Table({
    */
   useEffect(() => {
     if (!isPreview && !disabled && (!Array.isArray(storeValue) || storeValue.length === 0)) {
-      const initialRow: WorkflowTableRow = {
+      const initialRow: TableRow = {
         id: crypto.randomUUID(),
         cells: { ...emptyCellsTemplate },
       }
@@ -110,7 +110,7 @@ export function Table({
       }
     })
 
-    return validatedRows as WorkflowTableRow[]
+    return validatedRows as TableRow[]
   }, [value, emptyCellsTemplate])
 
   // Helper to update a cell value
@@ -164,12 +164,7 @@ export function Table({
     </thead>
   )
 
-  const renderCell = (
-    row: WorkflowTableRow,
-    rowIndex: number,
-    column: string,
-    cellIndex: number
-  ) => {
+  const renderCell = (row: TableRow, rowIndex: number, column: string, cellIndex: number) => {
     // Defensive programming: ensure row.cells exists and has the expected structure
     const hasValidCells = row.cells && typeof row.cells === 'object'
     if (!hasValidCells) logger.warn('Table row has malformed cells data:', row)

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx

@@ -35,11 +35,11 @@ import type {
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { getBlock } from '@/blocks'
 import type { BlockConfig } from '@/blocks/types'
-import { normalizeName } from '@/executor/constants'
 import type { Variable } from '@/stores/panel'
 import { useVariablesStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
+import { normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx

@@ -43,7 +43,6 @@ import {
   SlackSelectorInput,
   SliderInput,
   Table,
-  TableSelector,
   TimeInput,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components'
 import { DocumentSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector'
@@ -509,40 +508,6 @@ function TableSyncWrapper({
   )
 }
 
-function TableSelectorSyncWrapper({
-  blockId,
-  paramId,
-  value,
-  onChange,
-  uiComponent,
-  disabled,
-  isPreview,
-}: {
-  blockId: string
-  paramId: string
-  value: string
-  onChange: (value: string) => void
-  uiComponent: any
-  disabled: boolean
-  isPreview: boolean
-}) {
-  return (
-    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
-      <TableSelector
-        blockId={blockId}
-        subBlock={{
-          id: paramId,
-          type: 'table-selector',
-          placeholder: uiComponent.placeholder || 'Select a table',
-        }}
-        disabled={disabled}
-        isPreview={isPreview}
-        previewValue={value || null}
-      />
-    </GenericSyncWrapper>
-  )
-}
-
 function TimeInputSyncWrapper({
   blockId,
   paramId,
@@ -1000,7 +965,6 @@ const BUILT_IN_TOOL_TYPES = new Set([
   'tts',
   'stt',
   'memory',
-  'table',
   'webhook_request',
   'workflow',
 ])
@@ -1178,8 +1142,7 @@ export const ToolInput = memo(function ToolInput({
           block.type === 'workflow' ||
           block.type === 'workflow_input' ||
           block.type === 'knowledge' ||
-          block.type === 'function' ||
-          block.type === 'table') &&
+          block.type === 'function') &&
         block.type !== 'evaluator' &&
         block.type !== 'mcp' &&
         block.type !== 'file'
@@ -2177,19 +2140,6 @@ export const ToolInput = memo(function ToolInput({
           />
         )
 
-      case 'table-selector':
-        return (
-          <TableSelectorSyncWrapper
-            blockId={blockId}
-            paramId={param.id}
-            value={value}
-            onChange={onChange}
-            uiComponent={uiComponent}
-            disabled={disabled}
-            isPreview={isPreview}
-          />
-        )
-
       case 'combobox':
         return (
           <ComboboxSyncWrapper

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts

@@ -2,7 +2,6 @@
 
 import { useCallback, useMemo } from 'react'
 import { isEqual } from 'lodash'
-import { useStoreWithEqualityFn } from 'zustand/traditional'
 import {
   buildCanonicalIndex,
   isNonEmptyValue,
@@ -152,7 +151,7 @@ export function useDependsOnGate(
 
   // Get values for all dependency fields (both all and any)
   // Use isEqual to prevent re-renders when dependency values haven't actually changed
-  const dependencyValuesMap = useStoreWithEqualityFn(useSubBlockStore, dependencySelector, isEqual)
+  const dependencyValuesMap = useSubBlockStore(dependencySelector, isEqual)
 
   const depsSatisfied = useMemo(() => {
     // Check all fields (AND logic) - all must be satisfied

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts

@@ -2,7 +2,6 @@ import { useCallback, useEffect, useRef } from 'react'
 import { createLogger } from '@sim/logger'
 import { isEqual } from 'lodash'
 import { useShallow } from 'zustand/react/shallow'
-import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { getProviderFromModel } from '@/providers/utils'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -59,8 +58,7 @@ export function useSubBlockValue<T = any>(
   const streamingValueRef = useRef<T | null>(null)
   const wasStreamingRef = useRef<boolean>(false)
 
-  const storeValue = useStoreWithEqualityFn(
-    useSubBlockStore,
+  const storeValue = useSubBlockStore(
     useCallback(
       (state) => {
         // If the active workflow ID isn't available yet, return undefined so we can fall back to initialValue
@@ -94,8 +92,7 @@ export function useSubBlockValue<T = any>(
 
   // Always call this hook unconditionally - don't wrap it in a condition
   // Optimized: only re-render if model value actually changes
-  const modelSubBlockValue = useStoreWithEqualityFn(
-    useSubBlockStore,
+  const modelSubBlockValue = useSubBlockStore(
     useCallback((state) => (blockId ? state.getValue(blockId, 'model') : null), [blockId]),
     (a, b) => a === b
   )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx

@@ -1,10 +1,8 @@
-import { type JSX, type MouseEvent, memo, useCallback, useRef, useState } from 'react'
+import { type JSX, type MouseEvent, memo, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
-import { AlertTriangle, ArrowLeftRight, ArrowUp, ExternalLink } from 'lucide-react'
-import { useParams } from 'next/navigation'
+import { AlertTriangle, ArrowLeftRight, ArrowUp } from 'lucide-react'
 import { Button, Input, Label, Tooltip } from '@/components/emcn/components'
 import { cn } from '@/lib/core/utils/cn'
-import type { FilterRule, SortRule } from '@/lib/table/query-builder/constants'
 import type { FieldDiffStatus } from '@/lib/workflows/diff/types'
 import {
   CheckboxList,
@@ -18,7 +16,6 @@ import {
   EvalInput,
   FileSelectorInput,
   FileUpload,
-  FilterBuilder,
   FolderSelectorInput,
   GroupedCheckboxList,
   InputFormat,
@@ -37,10 +34,8 @@ import {
   ShortInput,
   SlackSelectorInput,
   SliderInput,
-  SortBuilder,
   Switch,
   Table,
-  TableSelector,
   Text,
   TimeInput,
   ToolInput,
@@ -176,7 +171,6 @@ const getPreviewValue = (
  * @param wandState - Optional state and handlers for the AI wand feature
  * @param canonicalToggle - Optional canonical toggle metadata and handlers
  * @param canonicalToggleIsDisabled - Whether the canonical toggle is disabled
- * @param tableLinkState - Optional state for table selector external link
  * @returns The label JSX element, or `null` for switch types or when no title is defined
  */
 const renderLabel = (
@@ -202,11 +196,7 @@ const renderLabel = (
     disabled?: boolean
     onToggle?: () => void
   },
-  canonicalToggleIsDisabled?: boolean,
-  tableLinkState?: {
-    hasSelectedTable: boolean
-    onNavigateToTable: () => void
-  }
+  canonicalToggleIsDisabled?: boolean
 ): JSX.Element | null => {
   if (config.type === 'switch') return null
   if (!config.title) return null
@@ -215,11 +205,6 @@ const renderLabel = (
   const showWand = wandState?.isWandEnabled && !wandState.isPreview && !wandState.disabled
   const showCanonicalToggle = !!canonicalToggle && !wandState?.isPreview
   const canonicalToggleDisabledResolved = canonicalToggleIsDisabled ?? canonicalToggle?.disabled
-  const showTableLink =
-    config.type === 'table-selector' &&
-    tableLinkState?.hasSelectedTable &&
-    !wandState?.isPreview &&
-    !wandState?.disabled
 
   return (
     <div className='flex items-center justify-between gap-[6px] pl-[2px]'>
@@ -299,23 +284,6 @@ const renderLabel = (
             )}
           </>
         )}
-        {showTableLink && (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <button
-                type='button'
-                className='flex h-[12px] w-[12px] flex-shrink-0 items-center justify-center bg-transparent p-0'
-                onClick={tableLinkState.onNavigateToTable}
-                aria-label='View table'
-              >
-                <ExternalLink className='!h-[12px] !w-[12px] text-[var(--text-secondary)] hover:text-[var(--text-primary)]' />
-              </button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              <p>View table</p>
-            </Tooltip.Content>
-          </Tooltip.Root>
-        )}
         {showCanonicalToggle && (
           <button
             type='button'
@@ -396,9 +364,6 @@ function SubBlockComponent({
   allowExpandInPreview,
   canonicalToggle,
 }: SubBlockProps): JSX.Element {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
   const [isValidJson, setIsValidJson] = useState(true)
   const [isSearchActive, setIsSearchActive] = useState(false)
   const [searchQuery, setSearchQuery] = useState('')
@@ -416,20 +381,6 @@ function SubBlockComponent({
   // Check if wand is enabled for this sub-block
   const isWandEnabled = config.wandConfig?.enabled ?? false
 
-  // Table selector link state
-  const tableValue = subBlockValues?.[config.id]?.value
-  const tableId = typeof tableValue === 'string' ? tableValue : null
-  const hasSelectedTable = Boolean(tableId && !tableId.startsWith('<'))
-
-  /**
-   * Handles navigation to the selected table in a new tab.
-   */
-  const handleNavigateToTable = useCallback(() => {
-    if (tableId && workspaceId) {
-      window.open(`/workspace/${workspaceId}/tables/${tableId}`, '_blank')
-    }
-  }, [workspaceId, tableId])
-
   /**
    * Handles wand icon click to activate inline prompt mode.
    * Focuses the input after a brief delay to ensure DOM is ready.
@@ -564,19 +515,6 @@ function SubBlockComponent({
           </div>
         )
 
-      case 'table-selector':
-        return (
-          <div onMouseDown={handleMouseDown}>
-            <TableSelector
-              blockId={blockId}
-              subBlock={config}
-              disabled={isDisabled}
-              isPreview={isPreview}
-              previewValue={previewValue as string | null}
-            />
-          </div>
-        )
-
       case 'combobox':
         return (
           <div onMouseDown={handleMouseDown}>
@@ -919,28 +857,6 @@ function SubBlockComponent({
           />
         )
 
-      case 'filter-builder':
-        return (
-          <FilterBuilder
-            blockId={blockId}
-            subBlockId={config.id}
-            isPreview={isPreview}
-            previewValue={previewValue as FilterRule[] | null | undefined}
-            disabled={isDisabled}
-          />
-        )
-
-      case 'sort-builder':
-        return (
-          <SortBuilder
-            blockId={blockId}
-            subBlockId={config.id}
-            isPreview={isPreview}
-            previewValue={previewValue as SortRule[] | null | undefined}
-            disabled={isDisabled}
-          />
-        )
-
       case 'channel-selector':
       case 'user-selector':
         return (
@@ -1037,11 +953,7 @@ function SubBlockComponent({
           searchInputRef,
         },
         canonicalToggle,
-        Boolean(canonicalToggle?.disabled || disabled || isPreview),
-        {
-          hasSelectedTable,
-          onNavigateToTable: handleNavigateToTable,
-        }
+        Boolean(canonicalToggle?.disabled || disabled || isPreview)
       )}
       {renderInput()}
     </div>

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx

@@ -4,7 +4,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
 import { BookOpen, Check, ChevronDown, ChevronUp, Pencil } from 'lucide-react'
 import { useShallow } from 'zustand/react/shallow'
-import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { Button, Tooltip } from '@/components/emcn'
 import {
   buildCanonicalIndex,
@@ -100,8 +99,7 @@ export function Editor() {
     currentWorkflow.isSnapshotView
   )
 
-  const blockSubBlockValues = useStoreWithEqualityFn(
-    useSubBlockStore,
+  const blockSubBlockValues = useSubBlockStore(
     useCallback(
       (state) => {
         if (!activeWorkflowId || !currentBlockId) return EMPTY_SUBBLOCK_VALUES

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts

@@ -1,4 +1,5 @@
-import { useShallow } from 'zustand/react/shallow'
+import { useCallback } from 'react'
+import { shallow } from 'zustand/shallow'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
@@ -12,26 +13,35 @@ import { useWorkflowStore } from '@/stores/workflows/workflow/store'
  */
 export function useEditorBlockProperties(blockId: string | null, isSnapshotView: boolean) {
   const normalBlockProps = useWorkflowStore(
-    useShallow((state) => {
-      if (!blockId) return { advancedMode: false, triggerMode: false }
-      const block = state.blocks?.[blockId]
-      return {
-        advancedMode: block?.advancedMode ?? false,
-        triggerMode: block?.triggerMode ?? false,
-      }
-    })
+    useCallback(
+      (state) => {
+        if (!blockId) return { advancedMode: false, triggerMode: false }
+        const block = state.blocks?.[blockId]
+        return {
+          advancedMode: block?.advancedMode ?? false,
+          triggerMode: block?.triggerMode ?? false,
+        }
+      },
+      [blockId]
+    ),
+    shallow
   )
 
   const baselineBlockProps = useWorkflowDiffStore(
-    useShallow((state) => {
-      if (!blockId) return { advancedMode: false, triggerMode: false }
-      const block = state.baselineWorkflow?.blocks?.[blockId]
-      return {
-        advancedMode: block?.advancedMode ?? false,
-        triggerMode: block?.triggerMode ?? false,
-      }
-    })
+    useCallback(
+      (state) => {
+        if (!blockId) return { advancedMode: false, triggerMode: false }
+        const block = state.baselineWorkflow?.blocks?.[blockId]
+        return {
+          advancedMode: block?.advancedMode ?? false,
+          triggerMode: block?.triggerMode ?? false,
+        }
+      },
+      [blockId]
+    ),
+    shallow
   )
 
+  // Use the appropriate props based on view mode
   return isSnapshotView ? baselineBlockProps : normalBlockProps
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx

@@ -3,13 +3,11 @@ import { createLogger } from '@sim/logger'
 import { isEqual } from 'lodash'
 import { useParams } from 'next/navigation'
 import { Handle, type NodeProps, Position, useUpdateNodeInternals } from 'reactflow'
-import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { Badge, Tooltip } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createMcpToolId } from '@/lib/mcp/utils'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
-import type { FilterRule, SortRule } from '@/lib/table/types'
 import { BLOCK_DIMENSIONS, HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
 import {
   buildCanonicalIndex,
@@ -41,7 +39,6 @@ import { useCustomTools } from '@/hooks/queries/custom-tools'
 import { useMcpServers, useMcpToolsQuery } from '@/hooks/queries/mcp'
 import { useCredentialName } from '@/hooks/queries/oauth-credentials'
 import { useReactivateSchedule, useScheduleInfo } from '@/hooks/queries/schedules'
-import { useTablesList } from '@/hooks/queries/use-tables'
 import { useDeployChildWorkflow } from '@/hooks/queries/workflows'
 import { useSelectorDisplayName } from '@/hooks/use-selector-display-name'
 import { useVariablesStore } from '@/stores/panel'
@@ -56,9 +53,9 @@ const logger = createLogger('WorkflowBlock')
 const EMPTY_SUBBLOCK_VALUES = {} as Record<string, any>
 
 /**
- * Type guard for workflow table row structure (sub-block table inputs)
+ * Type guard for table row structure
  */
-interface WorkflowTableRow {
+interface TableRow {
   id: string
   cells: Record<string, string>
 }
@@ -77,7 +74,7 @@ interface FieldFormat {
 /**
  * Checks if a value is a table row array
  */
-const isTableRowArray = (value: unknown): value is WorkflowTableRow[] => {
+const isTableRowArray = (value: unknown): value is TableRow[] => {
   if (!Array.isArray(value) || value.length === 0) return false
   const firstItem = value[0]
   return (
@@ -96,11 +93,7 @@ const isFieldFormatArray = (value: unknown): value is FieldFormat[] => {
   if (!Array.isArray(value) || value.length === 0) return false
   const firstItem = value[0]
   return (
-    typeof firstItem === 'object' &&
-    firstItem !== null &&
-    'id' in firstItem &&
-    'name' in firstItem &&
-    typeof firstItem.name === 'string'
+    typeof firstItem === 'object' && firstItem !== null && 'id' in firstItem && 'name' in firstItem
   )
 }
 
@@ -166,8 +159,7 @@ const isTagFilterArray = (value: unknown): value is TagFilterItem[] => {
     typeof firstItem === 'object' &&
     firstItem !== null &&
     'tagName' in firstItem &&
-    'tagValue' in firstItem &&
-    typeof firstItem.tagName === 'string'
+    'tagValue' in firstItem
   )
 }
 
@@ -189,40 +181,7 @@ const isDocumentTagArray = (value: unknown): value is DocumentTagItem[] => {
     firstItem !== null &&
     'tagName' in firstItem &&
     'value' in firstItem &&
-    !('tagValue' in firstItem) && // Distinguish from tag filters
-    typeof firstItem.tagName === 'string'
-  )
-}
-
-/**
- * Type guard for filter condition array (used in table block filter builder)
- */
-const isFilterConditionArray = (value: unknown): value is FilterRule[] => {
-  if (!Array.isArray(value) || value.length === 0) return false
-  const firstItem = value[0]
-  return (
-    typeof firstItem === 'object' &&
-    firstItem !== null &&
-    'column' in firstItem &&
-    'operator' in firstItem &&
-    'logicalOperator' in firstItem &&
-    typeof firstItem.column === 'string'
-  )
-}
-
-/**
- * Type guard for sort condition array (used in table block sort builder)
- */
-const isSortConditionArray = (value: unknown): value is SortRule[] => {
-  if (!Array.isArray(value) || value.length === 0) return false
-  const firstItem = value[0]
-  return (
-    typeof firstItem === 'object' &&
-    firstItem !== null &&
-    'column' in firstItem &&
-    'direction' in firstItem &&
-    typeof firstItem.column === 'string' &&
-    (firstItem.direction === 'asc' || firstItem.direction === 'desc')
+    !('tagValue' in firstItem) // Distinguish from tag filters
   )
 }
 
@@ -270,9 +229,7 @@ export const getDisplayValue = (value: unknown): string => {
   }
 
   if (isTagFilterArray(parsedValue)) {
-    const validFilters = parsedValue.filter(
-      (f) => typeof f.tagName === 'string' && f.tagName.trim() !== ''
-    )
+    const validFilters = parsedValue.filter((f) => f.tagName?.trim())
     if (validFilters.length === 0) return '-'
     if (validFilters.length === 1) return validFilters[0].tagName
     if (validFilters.length === 2) return `${validFilters[0].tagName}, ${validFilters[1].tagName}`
@@ -280,54 +237,13 @@ export const getDisplayValue = (value: unknown): string => {
   }
 
   if (isDocumentTagArray(parsedValue)) {
-    const validTags = parsedValue.filter(
-      (t) => typeof t.tagName === 'string' && t.tagName.trim() !== ''
-    )
+    const validTags = parsedValue.filter((t) => t.tagName?.trim())
     if (validTags.length === 0) return '-'
     if (validTags.length === 1) return validTags[0].tagName
     if (validTags.length === 2) return `${validTags[0].tagName}, ${validTags[1].tagName}`
     return `${validTags[0].tagName}, ${validTags[1].tagName} +${validTags.length - 2}`
   }
 
-  if (isFilterConditionArray(parsedValue)) {
-    const validConditions = parsedValue.filter(
-      (c) => typeof c.column === 'string' && c.column.trim() !== ''
-    )
-    if (validConditions.length === 0) return '-'
-    const formatCondition = (c: FilterRule) => {
-      const opLabels: Record<string, string> = {
-        eq: '=',
-        ne: '≠',
-        gt: '>',
-        gte: '≥',
-        lt: '<',
-        lte: '≤',
-        contains: '~',
-        in: 'in',
-      }
-      const op = opLabels[c.operator] || c.operator
-      return `${c.column} ${op} ${c.value || '?'}`
-    }
-    if (validConditions.length === 1) return formatCondition(validConditions[0])
-    if (validConditions.length === 2) {
-      return `${formatCondition(validConditions[0])}, ${formatCondition(validConditions[1])}`
-    }
-    return `${formatCondition(validConditions[0])}, ${formatCondition(validConditions[1])} +${validConditions.length - 2}`
-  }
-
-  if (isSortConditionArray(parsedValue)) {
-    const validConditions = parsedValue.filter(
-      (c) => typeof c.column === 'string' && c.column.trim() !== ''
-    )
-    if (validConditions.length === 0) return '-'
-    const formatSort = (c: SortRule) => `${c.column} ${c.direction === 'desc' ? '↓' : '↑'}`
-    if (validConditions.length === 1) return formatSort(validConditions[0])
-    if (validConditions.length === 2) {
-      return `${formatSort(validConditions[0])}, ${formatSort(validConditions[1])}`
-    }
-    return `${formatSort(validConditions[0])}, ${formatSort(validConditions[1])} +${validConditions.length - 2}`
-  }
-
   if (isTableRowArray(parsedValue)) {
     const nonEmptyRows = parsedValue.filter((row) => {
       const cellValues = Object.values(row.cells)
@@ -349,9 +265,7 @@ export const getDisplayValue = (value: unknown): string => {
   }
 
   if (isFieldFormatArray(parsedValue)) {
-    const namedFields = parsedValue.filter(
-      (field) => typeof field.name === 'string' && field.name.trim() !== ''
-    )
+    const namedFields = parsedValue.filter((field) => field.name && field.name.trim() !== '')
     if (namedFields.length === 0) return '-'
     if (namedFields.length === 1) return namedFields[0].name
     if (namedFields.length === 2) return `${namedFields[0].name}, ${namedFields[1].name}`
@@ -597,15 +511,6 @@ const SubBlockRow = memo(function SubBlockRow({
     return tool?.name ?? null
   }, [subBlock?.type, rawValue, mcpToolsData])
 
-  const { data: tables = [] } = useTablesList(workspaceId || '')
-  const tableDisplayName = useMemo(() => {
-    if (subBlock?.id !== 'tableId' || typeof rawValue !== 'string') {
-      return null
-    }
-    const table = tables.find((t) => t.id === rawValue)
-    return table?.name ?? null
-  }, [subBlock?.id, rawValue, tables])
-
   const webhookUrlDisplayValue = useMemo(() => {
     if (subBlock?.id !== 'webhookUrlDisplay' || !blockId) {
       return null
@@ -621,8 +526,7 @@ const SubBlockRow = memo(function SubBlockRow({
    * Subscribe only to variables for this workflow to avoid re-renders from other workflows.
    * Uses isEqual for deep comparison since Object.fromEntries creates a new object each time.
    */
-  const workflowVariables = useStoreWithEqualityFn(
-    useVariablesStore,
+  const workflowVariables = useVariablesStore(
     useCallback(
       (state) => {
         if (!workflowId) return {}
@@ -712,43 +616,19 @@ const SubBlockRow = memo(function SubBlockRow({
     return `${toolNames[0]}, ${toolNames[1]} +${toolNames.length - 2}`
   }, [subBlock?.type, rawValue, customTools, workspaceId])
 
-  const filterDisplayValue = useMemo(() => {
-    const isFilterField =
-      subBlock?.id === 'filter' || subBlock?.id === 'filterCriteria' || subBlock?.id === 'sort'
-
-    if (!isFilterField || !rawValue) return null
-
-    const parsedValue = tryParseJson(rawValue)
-
-    if (isPlainObject(parsedValue) || Array.isArray(parsedValue)) {
-      try {
-        const jsonStr = JSON.stringify(parsedValue, null, 0)
-        if (jsonStr.length <= 35) return jsonStr
-        return `${jsonStr.slice(0, 32)}...`
-      } catch {
-        return null
-      }
-    }
-
-    return null
-  }, [subBlock?.id, rawValue])
-
   const isPasswordField = subBlock?.password === true
   const maskedValue = isPasswordField && value && value !== '-' ? '•••' : null
-  const isMonospaceField = Boolean(filterDisplayValue)
 
   const isSelectorType = subBlock?.type && SELECTOR_TYPES_HYDRATION_REQUIRED.includes(subBlock.type)
   const hydratedName =
     credentialName ||
     dropdownLabel ||
     variablesDisplayValue ||
-    filterDisplayValue ||
     toolsDisplayValue ||
     knowledgeBaseDisplayName ||
     workflowSelectionName ||
     mcpServerDisplayName ||
     mcpToolDisplayName ||
-    tableDisplayName ||
     webhookUrlDisplayValue ||
     selectorDisplayName
   const displayValue = maskedValue || hydratedName || (isSelectorType && value ? '-' : value)
@@ -763,10 +643,7 @@ const SubBlockRow = memo(function SubBlockRow({
       </span>
       {displayValue !== undefined && (
         <span
-          className={cn(
-            'flex-1 truncate text-right text-[14px] text-[var(--text-primary)]',
-            isMonospaceField && 'font-mono'
-          )}
+          className='flex-1 truncate text-right text-[14px] text-[var(--text-primary)]'
           title={displayValue}
         >
           {displayValue}
@@ -852,8 +729,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
   const isStarterBlock = type === 'starter'
   const isWebhookTriggerBlock = type === 'webhook' || type === 'generic_webhook'
 
-  const blockSubBlockValues = useStoreWithEqualityFn(
-    useSubBlockStore,
+  const blockSubBlockValues = useSubBlockStore(
     useCallback(
       (state) => {
         if (!activeWorkflowId) return EMPTY_SUBBLOCK_VALUES

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand.ts

@@ -3,37 +3,23 @@ import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
 import type { GenerationType } from '@/blocks/types'
 import { subscriptionKeys } from '@/hooks/queries/subscription'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 const logger = createLogger('useWand')
 
-interface ChatMessage {
-  role: 'user' | 'assistant' | 'system'
-  content: string
-}
-
-interface BuildWandContextInfoOptions {
-  currentValue?: string
-  generationType?: string
-}
-
 /**
- * Builds rich context information based on current content and generation type.
- * Note: Table schema context is now fetched server-side in /api/wand for simplicity.
+ * Builds rich context information based on current content and generation type
  */
-function buildWandContextInfo({
-  currentValue,
-  generationType,
-}: BuildWandContextInfoOptions): string {
-  const hasContent = Boolean(currentValue && currentValue.trim() !== '')
-  const contentLength = currentValue?.length ?? 0
-  const lineCount = currentValue ? currentValue.split('\n').length : 0
+function buildContextInfo(currentValue?: string, generationType?: string): string {
+  if (!currentValue || currentValue.trim() === '') {
+    return 'no current content'
+  }
 
-  let contextInfo = hasContent
-    ? `Current content (${contentLength} characters, ${lineCount} lines):\n${currentValue}`
-    : 'no current content'
+  const contentLength = currentValue.length
+  const lineCount = currentValue.split('\n').length
 
-  if (generationType && currentValue) {
+  let contextInfo = `Current content (${contentLength} characters, ${lineCount} lines):\n${currentValue}`
+
+  if (generationType) {
     switch (generationType) {
       case 'javascript-function-body':
       case 'typescript-function-body': {
@@ -46,7 +32,6 @@ function buildWandContextInfo({
 
       case 'json-schema':
       case 'json-object':
-      case 'table-schema':
         try {
           const parsed = JSON.parse(currentValue)
           const keys = Object.keys(parsed)
@@ -61,6 +46,11 @@ function buildWandContextInfo({
   return contextInfo
 }
 
+interface ChatMessage {
+  role: 'user' | 'assistant' | 'system'
+  content: string
+}
+
 export interface WandConfig {
   enabled: boolean
   prompt: string
@@ -72,9 +62,6 @@ export interface WandConfig {
 interface UseWandProps {
   wandConfig?: WandConfig
   currentValue?: string
-  contextParams?: {
-    tableId?: string | null
-  }
   onGeneratedContent: (content: string) => void
   onStreamChunk?: (chunk: string) => void
   onStreamStart?: () => void
@@ -84,14 +71,12 @@ interface UseWandProps {
 export function useWand({
   wandConfig,
   currentValue,
-  contextParams,
   onGeneratedContent,
   onStreamChunk,
   onStreamStart,
   onGenerationComplete,
 }: UseWandProps) {
   const queryClient = useQueryClient()
-  const workflowId = useWorkflowRegistry((state) => state.hydration.workflowId)
   const [isLoading, setIsLoading] = useState(false)
   const [isPromptVisible, setIsPromptVisible] = useState(false)
   const [promptInputValue, setPromptInputValue] = useState('')
@@ -162,10 +147,7 @@ export function useWand({
       }
 
       try {
-        const contextInfo = buildWandContextInfo({
-          currentValue,
-          generationType: wandConfig?.generationType,
-        })
+        const contextInfo = buildContextInfo(currentValue, wandConfig?.generationType)
 
         let systemPrompt = wandConfig?.prompt || ''
         if (systemPrompt.includes('{context}')) {
@@ -188,8 +170,6 @@ export function useWand({
             stream: true,
             history: wandConfig?.maintainHistory ? conversationHistory : [],
             generationType: wandConfig?.generationType,
-            workflowId,
-            wandContext: contextParams?.tableId ? { tableId: contextParams.tableId } : undefined,
           }),
           signal: abortControllerRef.current.signal,
           cache: 'no-store',
@@ -296,8 +276,6 @@ export function useWand({
       onStreamStart,
       onGenerationComplete,
       queryClient,
-      contextParams?.tableId,
-      workflowId,
     ]
   )
 

apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx

@@ -215,10 +215,7 @@ export function WorkflowPreview({
   executedBlocks,
   selectedBlockId,
 }: WorkflowPreviewProps) {
-  const nodeTypes = useMemo(
-    () => (lightweight ? lightweightNodeTypes : fullNodeTypes),
-    [lightweight]
-  )
+  const nodeTypes = lightweight ? lightweightNodeTypes : fullNodeTypes
   const isValidWorkflowState = workflowState?.blocks && workflowState.edges
 
   const blocksStructure = useMemo(() => {

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -2,7 +2,7 @@
 
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { Database, HelpCircle, Layout, Plus, Search, Settings, Table } from 'lucide-react'
+import { Database, HelpCircle, Layout, Plus, Search, Settings } from 'lucide-react'
 import Link from 'next/link'
 import { useParams, usePathname, useRouter } from 'next/navigation'
 import { Button, Download, FolderPlus, Library, Loader, Tooltip } from '@/components/emcn'
@@ -263,12 +263,6 @@ export const Sidebar = memo(function Sidebar() {
           href: `/workspace/${workspaceId}/knowledge`,
           hidden: permissionConfig.hideKnowledgeBaseTab,
         },
-        {
-          id: 'tables',
-          label: 'Tables',
-          icon: Table,
-          href: `/workspace/${workspaceId}/tables`,
-        },
         {
           id: 'help',
           label: 'Help',

apps/sim/blocks/blocks.test.ts

@@ -409,9 +409,6 @@ describe('Blocks Module', () => {
         'workflow-input-mapper',
         'text',
         'router-input',
-        'table-selector',
-        'filter-builder',
-        'sort-builder',
       ]
 
       const blocks = getAllBlocks()

apps/sim/blocks/blocks/table.ts

@@ -1,679 +0,0 @@
-import { TableIcon } from '@/components/icons'
-import { TABLE_LIMITS } from '@/lib/table/constants'
-import { filterRulesToFilter, sortRulesToSort } from '@/lib/table/query-builder/converters'
-import type { BlockConfig } from '@/blocks/types'
-import type { TableQueryResponse } from '@/tools/table/types'
-
-/**
- * Parses a JSON string with helpful error messages.
- *
- * Handles common issues like unquoted block references in JSON values.
- *
- * @param value - The value to parse (string or already-parsed object)
- * @param fieldName - Name of the field for error messages
- * @returns Parsed JSON value
- * @throws Error with helpful hints if JSON is invalid
- */
-function parseJSON(value: string | unknown, fieldName: string): unknown {
-  if (typeof value !== 'string') return value
-
-  try {
-    return JSON.parse(value)
-  } catch (error) {
-    const errorMsg = error instanceof Error ? error.message : String(error)
-
-    // Check if the error might be due to unquoted string values
-    // This happens when users write {"field": <ref>} instead of {"field": "<ref>"}
-    const unquotedValueMatch = value.match(
-      /:\s*([a-zA-Z][a-zA-Z0-9_\s]*[a-zA-Z0-9]|[a-zA-Z])\s*[,}]/
-    )
-
-    let hint =
-      'Make sure all property names are in double quotes (e.g., {"name": "value"} not {name: "value"}).'
-
-    if (unquotedValueMatch) {
-      hint =
-        'It looks like a string value is not quoted. When using block references in JSON, wrap them in double quotes: {"field": "<blockName.output>"} not {"field": <blockName.output>}.'
-    }
-
-    throw new Error(`Invalid JSON in ${fieldName}: ${errorMsg}. ${hint}`)
-  }
-}
-
-/** Raw params from block UI before JSON parsing and type conversion */
-interface TableBlockParams {
-  operation: string
-  tableId?: string
-  rowId?: string
-  data?: string | unknown
-  rows?: string | unknown
-  filter?: string | unknown
-  sort?: string | unknown
-  limit?: string
-  offset?: string
-  builderMode?: string
-  filterBuilder?: unknown
-  sortBuilder?: unknown
-  bulkFilterMode?: string
-  bulkFilterBuilder?: unknown
-}
-
-/** Normalized params after parsing, ready for tool request body */
-interface ParsedParams {
-  tableId?: string
-  rowId?: string
-  data?: unknown
-  rows?: unknown
-  filter?: unknown
-  sort?: unknown
-  limit?: number
-  offset?: number
-}
-
-/** Transforms raw block params into tool request params for each operation */
-const paramTransformers: Record<string, (params: TableBlockParams) => ParsedParams> = {
-  insert_row: (params) => ({
-    tableId: params.tableId,
-    data: parseJSON(params.data, 'Row Data'),
-  }),
-
-  upsert_row: (params) => ({
-    tableId: params.tableId,
-    data: parseJSON(params.data, 'Row Data'),
-  }),
-
-  batch_insert_rows: (params) => ({
-    tableId: params.tableId,
-    rows: parseJSON(params.rows, 'Rows Data'),
-  }),
-
-  update_row: (params) => ({
-    tableId: params.tableId,
-    rowId: params.rowId,
-    data: parseJSON(params.data, 'Row Data'),
-  }),
-
-  update_rows_by_filter: (params) => {
-    let filter: unknown
-    if (params.bulkFilterMode === 'builder' && params.bulkFilterBuilder) {
-      filter =
-        filterRulesToFilter(
-          params.bulkFilterBuilder as Parameters<typeof filterRulesToFilter>[0]
-        ) || undefined
-    } else if (params.filter) {
-      filter = parseJSON(params.filter, 'Filter')
-    }
-
-    return {
-      tableId: params.tableId,
-      filter,
-      data: parseJSON(params.data, 'Row Data'),
-      limit: params.limit ? Number.parseInt(params.limit) : undefined,
-    }
-  },
-
-  delete_row: (params) => ({
-    tableId: params.tableId,
-    rowId: params.rowId,
-  }),
-
-  delete_rows_by_filter: (params) => {
-    let filter: unknown
-    if (params.bulkFilterMode === 'builder' && params.bulkFilterBuilder) {
-      filter =
-        filterRulesToFilter(
-          params.bulkFilterBuilder as Parameters<typeof filterRulesToFilter>[0]
-        ) || undefined
-    } else if (params.filter) {
-      filter = parseJSON(params.filter, 'Filter')
-    }
-
-    return {
-      tableId: params.tableId,
-      filter,
-      limit: params.limit ? Number.parseInt(params.limit) : undefined,
-    }
-  },
-
-  get_row: (params) => ({
-    tableId: params.tableId,
-    rowId: params.rowId,
-  }),
-
-  get_schema: (params) => ({
-    tableId: params.tableId,
-  }),
-
-  query_rows: (params) => {
-    let filter: unknown
-    if (params.builderMode === 'builder' && params.filterBuilder) {
-      filter =
-        filterRulesToFilter(params.filterBuilder as Parameters<typeof filterRulesToFilter>[0]) ||
-        undefined
-    } else if (params.filter) {
-      filter = parseJSON(params.filter, 'Filter')
-    }
-
-    let sort: unknown
-    if (params.builderMode === 'builder' && params.sortBuilder) {
-      sort =
-        sortRulesToSort(params.sortBuilder as Parameters<typeof sortRulesToSort>[0]) || undefined
-    } else if (params.sort) {
-      sort = parseJSON(params.sort, 'Sort')
-    }
-
-    return {
-      tableId: params.tableId,
-      filter,
-      sort,
-      limit: params.limit ? Number.parseInt(params.limit) : 100,
-      offset: params.offset ? Number.parseInt(params.offset) : 0,
-    }
-  },
-}
-
-export const TableBlock: BlockConfig<TableQueryResponse> = {
-  type: 'table',
-  name: 'Table',
-  description: 'User-defined data tables',
-  longDescription:
-    'Create and manage custom data tables. Store, query, and manipulate structured data within workflows.',
-  docsLink: 'https://docs.simstudio.ai/tools/table',
-  category: 'blocks',
-  bgColor: '#10B981',
-  icon: TableIcon,
-  subBlocks: [
-    {
-      id: 'operation',
-      title: 'Operation',
-      type: 'dropdown',
-      options: [
-        { label: 'Query Rows', id: 'query_rows' },
-        { label: 'Insert Row', id: 'insert_row' },
-        { label: 'Upsert Row', id: 'upsert_row' },
-        { label: 'Batch Insert Rows', id: 'batch_insert_rows' },
-        { label: 'Update Rows by Filter', id: 'update_rows_by_filter' },
-        { label: 'Delete Rows by Filter', id: 'delete_rows_by_filter' },
-        { label: 'Update Row by ID', id: 'update_row' },
-        { label: 'Delete Row by ID', id: 'delete_row' },
-        { label: 'Get Row by ID', id: 'get_row' },
-        { label: 'Get Schema', id: 'get_schema' },
-      ],
-      value: () => 'query_rows',
-    },
-
-    // Table selector (for all operations)
-    {
-      id: 'tableId',
-      title: 'Table',
-      type: 'table-selector',
-      placeholder: 'Select a table',
-      required: true,
-    },
-
-    // Row ID for get/update/delete
-    {
-      id: 'rowId',
-      title: 'Row ID',
-      type: 'short-input',
-      placeholder: 'row_xxxxx',
-      condition: { field: 'operation', value: ['get_row', 'update_row', 'delete_row'] },
-      required: true,
-    },
-
-    // Insert/Update/Upsert Row data (single row)
-    {
-      id: 'data',
-      title: 'Row Data (JSON)',
-      type: 'code',
-      placeholder: '{"column_name": "value"}',
-      condition: {
-        field: 'operation',
-        value: ['insert_row', 'upsert_row', 'update_row', 'update_rows_by_filter'],
-      },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        maintainHistory: true,
-        prompt: `Generate row data as a JSON object matching the table's column schema.
-
-### CONTEXT
-{context}
-
-### INSTRUCTION
-Return ONLY a valid JSON object with field values based on the table's columns. No explanations or markdown.
-
-IMPORTANT: Reference the table schema visible in the table selector to know which columns exist and their types.
-
-### EXAMPLES
-
-Table with columns: email (string), name (string), age (number)
-"user with email john@example.com and age 25"
-→ {"email": "john@example.com", "name": "John", "age": 25}
-
-Table with columns: customer_id (string), total (number), status (string)
-"order with customer ID 123, total 99.99, status pending"
-→ {"customer_id": "123", "total": 99.99, "status": "pending"}
-
-Return ONLY the data JSON:`,
-        generationType: 'table-schema',
-      },
-    },
-
-    // Batch Insert - multiple rows
-    {
-      id: 'rows',
-      title: 'Rows Data (Array of JSON)',
-      type: 'code',
-      placeholder: '[{"col1": "val1"}, {"col1": "val2"}]',
-      condition: { field: 'operation', value: 'batch_insert_rows' },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        maintainHistory: true,
-        prompt: `Generate an array of row data objects matching the table's column schema.
-
-### CONTEXT
-{context}
-
-### INSTRUCTION
-Return ONLY a valid JSON array of objects. Each object represents one row. No explanations or markdown.
-Maximum ${TABLE_LIMITS.MAX_BATCH_INSERT_SIZE} rows per batch.
-
-IMPORTANT: Reference the table schema to know which columns exist and their types.
-
-### EXAMPLES
-
-Table with columns: email (string), name (string), age (number)
-"3 users: john@example.com age 25, jane@example.com age 30, bob@example.com age 28"
-→ [
-  {"email": "john@example.com", "name": "John", "age": 25},
-  {"email": "jane@example.com", "name": "Jane", "age": 30},
-  {"email": "bob@example.com", "name": "Bob", "age": 28}
-]
-
-Return ONLY the rows array:`,
-        generationType: 'table-schema',
-      },
-    },
-
-    // Filter mode selector for bulk operations
-    {
-      id: 'bulkFilterMode',
-      title: 'Filter Mode',
-      type: 'dropdown',
-      options: [
-        { label: 'Builder', id: 'builder' },
-        { label: 'Editor', id: 'json' },
-      ],
-      value: () => 'builder',
-      condition: {
-        field: 'operation',
-        value: ['update_rows_by_filter', 'delete_rows_by_filter'],
-      },
-    },
-
-    // Filter builder for bulk operations (visual)
-    {
-      id: 'bulkFilterBuilder',
-      title: 'Filter Conditions',
-      type: 'filter-builder',
-      required: {
-        field: 'operation',
-        value: ['update_rows_by_filter', 'delete_rows_by_filter'],
-      },
-      condition: {
-        field: 'operation',
-        value: ['update_rows_by_filter', 'delete_rows_by_filter'],
-        and: { field: 'bulkFilterMode', value: 'builder' },
-      },
-    },
-
-    // Filter for update/delete operations (JSON editor - bulk ops)
-    {
-      id: 'filter',
-      title: 'Filter',
-      type: 'code',
-      placeholder: '{"column_name": {"$eq": "value"}}',
-      condition: {
-        field: 'operation',
-        value: ['update_rows_by_filter', 'delete_rows_by_filter'],
-        and: { field: 'bulkFilterMode', value: 'json' },
-      },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        maintainHistory: true,
-        prompt: `Generate filter criteria for selecting rows in a table.
-
-### CONTEXT
-{context}
-
-### INSTRUCTION
-Return ONLY a valid JSON filter object. No explanations or markdown.
-
-IMPORTANT: Reference the table schema to know which columns exist and their types.
-
-### OPERATORS
-- **$eq**: Equals - {"column": {"$eq": "value"}} or {"column": "value"}
-- **$ne**: Not equals - {"column": {"$ne": "value"}}
-- **$gt**: Greater than - {"column": {"$gt": 18}}
-- **$gte**: Greater than or equal - {"column": {"$gte": 100}}
-- **$lt**: Less than - {"column": {"$lt": 90}}
-- **$lte**: Less than or equal - {"column": {"$lte": 5}}
-- **$in**: In array - {"column": {"$in": ["value1", "value2"]}}
-- **$nin**: Not in array - {"column": {"$nin": ["value1", "value2"]}}
-- **$contains**: String contains - {"column": {"$contains": "text"}}
-
-### EXAMPLES
-
-"rows where status is active"
-→ {"status": "active"}
-
-"rows where age is over 18 and status is pending"
-→ {"age": {"$gte": 18}, "status": "pending"}
-
-"rows where email contains gmail.com"
-→ {"email": {"$contains": "gmail.com"}}
-
-Return ONLY the filter JSON:`,
-        generationType: 'table-schema',
-      },
-    },
-
-    // Builder mode selector for query_rows (controls both filter and sort)
-    {
-      id: 'builderMode',
-      title: 'Input Mode',
-      type: 'dropdown',
-      options: [
-        { label: 'Builder', id: 'builder' },
-        { label: 'Editor', id: 'json' },
-      ],
-      value: () => 'builder',
-      condition: { field: 'operation', value: 'query_rows' },
-    },
-
-    // Filter builder (visual)
-    {
-      id: 'filterBuilder',
-      title: 'Filter Conditions',
-      type: 'filter-builder',
-      condition: {
-        field: 'operation',
-        value: 'query_rows',
-        and: { field: 'builderMode', value: 'builder' },
-      },
-    },
-
-    // Sort builder (visual)
-    {
-      id: 'sortBuilder',
-      title: 'Sort Order',
-      type: 'sort-builder',
-      condition: {
-        field: 'operation',
-        value: 'query_rows',
-        and: { field: 'builderMode', value: 'builder' },
-      },
-    },
-
-    // Filter for query_rows (JSON editor mode or tool call context)
-    {
-      id: 'filter',
-      title: 'Filter',
-      type: 'code',
-      placeholder: '{"column_name": {"$eq": "value"}}',
-      condition: {
-        field: 'operation',
-        value: 'query_rows',
-        and: { field: 'builderMode', value: 'builder', not: true },
-      },
-      wandConfig: {
-        enabled: true,
-        maintainHistory: true,
-        prompt: `Generate filter criteria for selecting rows in a table.
-
-### CONTEXT
-{context}
-
-### INSTRUCTION
-Return ONLY a valid JSON filter object. No explanations or markdown.
-
-IMPORTANT: Reference the table schema to know which columns exist and their types.
-
-### OPERATORS
-- **$eq**: Equals - {"column": {"$eq": "value"}} or {"column": "value"}
-- **$ne**: Not equals - {"column": {"$ne": "value"}}
-- **$gt**: Greater than - {"column": {"$gt": 18}}
-- **$gte**: Greater than or equal - {"column": {"$gte": 100}}
-- **$lt**: Less than - {"column": {"$lt": 90}}
-- **$lte**: Less than or equal - {"column": {"$lte": 5}}
-- **$in**: In array - {"column": {"$in": ["value1", "value2"]}}
-- **$nin**: Not in array - {"column": {"$nin": ["value1", "value2"]}}
-- **$contains**: String contains - {"column": {"$contains": "text"}}
-
-### EXAMPLES
-
-"rows where status is active"
-→ {"status": "active"}
-
-"rows where age is over 18 and status is pending"
-→ {"age": {"$gte": 18}, "status": "pending"}
-
-"rows where email contains gmail.com"
-→ {"email": {"$contains": "gmail.com"}}
-
-Return ONLY the filter JSON:`,
-        generationType: 'table-schema',
-      },
-    },
-
-    // Sort (JSON editor or tool call context)
-    {
-      id: 'sort',
-      title: 'Sort',
-      type: 'code',
-      placeholder: '{"column_name": "desc"}',
-      condition: {
-        field: 'operation',
-        value: 'query_rows',
-        and: { field: 'builderMode', value: 'builder', not: true },
-      },
-      wandConfig: {
-        enabled: true,
-        maintainHistory: true,
-        prompt: `Generate sort order for table query results.
-
-### CONTEXT
-{context}
-
-### INSTRUCTION
-Return ONLY a valid JSON object specifying sort order. No explanations or markdown.
-
-IMPORTANT: Reference the table schema to know which columns exist. You can sort by any column or the built-in columns (createdAt, updatedAt).
-
-### FORMAT
-{"column_name": "asc" or "desc"}
-
-You can specify multiple columns for multi-level sorting.
-
-### EXAMPLES
-
-Table with columns: name (string), age (number), email (string), createdAt (date)
-
-"sort by newest first"
-→ {"createdAt": "desc"}
-
-"sort by name alphabetically"
-→ {"name": "asc"}
-
-"sort by age descending"
-→ {"age": "desc"}
-
-"sort by age descending, then name ascending"
-→ {"age": "desc", "name": "asc"}
-
-"sort by oldest created first"
-→ {"createdAt": "asc"}
-
-Return ONLY the sort JSON:`,
-        generationType: 'table-schema',
-      },
-    },
-    {
-      id: 'limit',
-      title: 'Limit',
-      type: 'short-input',
-      placeholder: '100',
-      condition: {
-        field: 'operation',
-        value: ['query_rows', 'update_rows_by_filter', 'delete_rows_by_filter'],
-      },
-    },
-    {
-      id: 'offset',
-      title: 'Offset',
-      type: 'short-input',
-      placeholder: '0',
-      condition: { field: 'operation', value: 'query_rows' },
-      value: () => '0',
-    },
-  ],
-
-  tools: {
-    access: [
-      'table_insert_row',
-      'table_batch_insert_rows',
-      'table_upsert_row',
-      'table_update_row',
-      'table_update_rows_by_filter',
-      'table_delete_row',
-      'table_delete_rows_by_filter',
-      'table_query_rows',
-      'table_get_row',
-      'table_get_schema',
-    ],
-    config: {
-      tool: (params) => {
-        const toolMap: Record<string, string> = {
-          insert_row: 'table_insert_row',
-          batch_insert_rows: 'table_batch_insert_rows',
-          upsert_row: 'table_upsert_row',
-          update_row: 'table_update_row',
-          update_rows_by_filter: 'table_update_rows_by_filter',
-          delete_row: 'table_delete_row',
-          delete_rows_by_filter: 'table_delete_rows_by_filter',
-          query_rows: 'table_query_rows',
-          get_row: 'table_get_row',
-          get_schema: 'table_get_schema',
-        }
-        return toolMap[params.operation] || 'table_query_rows'
-      },
-      params: (params) => {
-        const { operation, ...rest } = params
-        const transformer = paramTransformers[operation]
-
-        if (transformer) {
-          return transformer(rest as TableBlockParams)
-        }
-
-        return rest
-      },
-    },
-  },
-
-  inputs: {
-    operation: { type: 'string', description: 'Table operation to perform' },
-    tableId: { type: 'string', description: 'Table identifier' },
-    data: { type: 'json', description: 'Row data for insert/update' },
-    rows: { type: 'array', description: 'Array of row data for batch insert' },
-    rowId: { type: 'string', description: 'Row identifier for ID-based operations' },
-    bulkFilterMode: {
-      type: 'string',
-      description: 'Filter input mode for bulk operations (builder or json)',
-    },
-    bulkFilterBuilder: {
-      type: 'json',
-      description: 'Visual filter builder conditions for bulk operations',
-    },
-    filter: { type: 'json', description: 'Filter criteria for query/update/delete operations' },
-    limit: { type: 'number', description: 'Query or bulk operation limit' },
-    builderMode: {
-      type: 'string',
-      description: 'Input mode for filter and sort (builder or json)',
-    },
-    filterBuilder: { type: 'json', description: 'Visual filter builder conditions' },
-    sortBuilder: { type: 'json', description: 'Visual sort builder conditions' },
-    sort: { type: 'json', description: 'Sort order (JSON)' },
-    offset: { type: 'number', description: 'Query result offset' },
-  },
-
-  outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    row: {
-      type: 'json',
-      description: 'Single row data',
-      condition: {
-        field: 'operation',
-        value: ['get_row', 'insert_row', 'upsert_row', 'update_row'],
-      },
-    },
-    operation: {
-      type: 'string',
-      description: 'Operation performed (insert or update)',
-      condition: { field: 'operation', value: 'upsert_row' },
-    },
-    rows: {
-      type: 'array',
-      description: 'Array of rows',
-      condition: { field: 'operation', value: ['query_rows', 'batch_insert_rows'] },
-    },
-    rowCount: {
-      type: 'number',
-      description: 'Number of rows returned',
-      condition: { field: 'operation', value: 'query_rows' },
-    },
-    totalCount: {
-      type: 'number',
-      description: 'Total rows matching filter',
-      condition: { field: 'operation', value: 'query_rows' },
-    },
-    insertedCount: {
-      type: 'number',
-      description: 'Number of rows inserted',
-      condition: { field: 'operation', value: 'batch_insert_rows' },
-    },
-    updatedCount: {
-      type: 'number',
-      description: 'Number of rows updated',
-      condition: { field: 'operation', value: 'update_rows_by_filter' },
-    },
-    updatedRowIds: {
-      type: 'array',
-      description: 'IDs of updated rows',
-      condition: { field: 'operation', value: 'update_rows_by_filter' },
-    },
-    deletedCount: {
-      type: 'number',
-      description: 'Number of rows deleted',
-      condition: { field: 'operation', value: ['delete_row', 'delete_rows_by_filter'] },
-    },
-    deletedRowIds: {
-      type: 'array',
-      description: 'IDs of deleted rows',
-      condition: { field: 'operation', value: 'delete_rows_by_filter' },
-    },
-    name: {
-      type: 'string',
-      description: 'Table name',
-      condition: { field: 'operation', value: 'get_schema' },
-    },
-    columns: {
-      type: 'array',
-      description: 'Column definitions',
-      condition: { field: 'operation', value: 'get_schema' },
-    },
-    message: { type: 'string', description: 'Operation status message' },
-  },
-}

apps/sim/blocks/registry.ts

@@ -121,7 +121,6 @@ import { StarterBlock } from '@/blocks/blocks/starter'
 import { StripeBlock } from '@/blocks/blocks/stripe'
 import { SttBlock } from '@/blocks/blocks/stt'
 import { SupabaseBlock } from '@/blocks/blocks/supabase'
-import { TableBlock } from '@/blocks/blocks/table'
 import { TavilyBlock } from '@/blocks/blocks/tavily'
 import { TelegramBlock } from '@/blocks/blocks/telegram'
 import { TextractBlock } from '@/blocks/blocks/textract'
@@ -289,7 +288,6 @@ export const registry: Record<string, BlockConfig> = {
   stripe: StripeBlock,
   stt: SttBlock,
   supabase: SupabaseBlock,
-  table: TableBlock,
   tavily: TavilyBlock,
   telegram: TelegramBlock,
   textract: TextractBlock,

apps/sim/blocks/types.ts

@@ -26,7 +26,6 @@ export type GenerationType =
   | 'typescript-function-body'
   | 'json-schema'
   | 'json-object'
-  | 'table-schema'
   | 'system-prompt'
   | 'custom-tool-schema'
   | 'sql-query'
@@ -73,8 +72,6 @@ export type SubBlockType =
   | 'mcp-dynamic-args' // MCP dynamic arguments based on tool schema
   | 'input-format' // Input structure format
   | 'response-format' // Response structure format
-  | 'filter-builder' // Filter conditions builder
-  | 'sort-builder' // Sort conditions builder
   /**
    * @deprecated Legacy trigger save subblock type.
    */
@@ -87,7 +84,6 @@ export type SubBlockType =
   | 'workflow-input-mapper' // Dynamic workflow input mapper based on selected workflow
   | 'text' // Read-only text display
   | 'router-input' // Router route definitions with descriptions
-  | 'table-selector' // Table selector with link to view table
 
 /**
  * Selector types that require display name hydration
@@ -107,7 +103,6 @@ export const SELECTOR_TYPES_HYDRATION_REQUIRED: SubBlockType[] = [
   'variables-input',
   'mcp-server-selector',
   'mcp-tool-selector',
-  'table-selector',
 ] as const
 
 export type ExtractToolOutput<T> = T extends ToolResponse ? T['output'] : never

apps/sim/components/icons.tsx

@@ -4696,26 +4696,6 @@ export function BedrockIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
-export function TableIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      xmlns='http://www.w3.org/2000/svg'
-      viewBox='0 0 24 24'
-      fill='none'
-      stroke='currentColor'
-      strokeWidth={2}
-      strokeLinecap='round'
-      strokeLinejoin='round'
-      {...props}
-    >
-      <rect width='18' height='18' x='3' y='3' rx='2' />
-      <path d='M3 9h18' />
-      <path d='M3 15h18' />
-      <path d='M9 3v18' />
-      <path d='M15 3v18' />
-    </svg>
-  )
-}
 export function ReductoIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg

apps/sim/components/ui/dialog.tsx

@@ -73,7 +73,6 @@ const DialogContent = React.forwardRef<
         }}
         {...props}
       >
-        <DialogPrimitive.Title>Dialog</DialogPrimitive.Title>
         {children}
         {!hideCloseButton && (
           <DialogPrimitive.Close

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -347,8 +347,8 @@ export class AgentBlockHandler implements BlockHandler {
   ): Promise<{ schema: any; code: string; title: string } | null> {
     if (typeof window !== 'undefined') {
       try {
-        const { getCustomTool } = await import('@/hooks/queries/custom-tools')
-        const tool = getCustomTool(customToolId, ctx.workspaceId)
+        const { useCustomToolsStore } = await import('@/stores/custom-tools')
+        const tool = useCustomToolsStore.getState().getTool(customToolId)
         if (tool) {
           return {
             schema: tool.schema,
@@ -356,9 +356,9 @@ export class AgentBlockHandler implements BlockHandler {
             title: tool.title,
           }
         }
-        logger.warn(`Custom tool not found in cache: ${customToolId}`)
+        logger.warn(`Custom tool not found in store: ${customToolId}`)
       } catch (error) {
-        logger.error('Error accessing custom tools cache:', { error })
+        logger.error('Error accessing custom tools store:', { error })
       }
     }
 

apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts

@@ -17,7 +17,6 @@ import {
 } from '@/executor/human-in-the-loop/utils'
 import type { BlockHandler, ExecutionContext, PauseMetadata } from '@/executor/types'
 import { collectBlockData } from '@/executor/utils/block-data'
-import { parseObjectStrings } from '@/executor/utils/json'
 import type { SerializedBlock } from '@/serializer/types'
 import { executeTool } from '@/tools'
 
@@ -266,7 +265,7 @@ export class HumanInTheLoopBlockHandler implements BlockHandler {
 
     if (dataMode === 'structured' && inputs.builderData) {
       const convertedData = this.convertBuilderDataToJson(inputs.builderData)
-      return parseObjectStrings(convertedData)
+      return this.parseObjectStrings(convertedData)
     }
 
     return inputs.data || {}
@@ -486,6 +485,29 @@ export class HumanInTheLoopBlockHandler implements BlockHandler {
     )
   }
 
+  private parseObjectStrings(data: any): any {
+    if (typeof data === 'string') {
+      try {
+        const parsed = JSON.parse(data)
+        if (typeof parsed === 'object' && parsed !== null) {
+          return this.parseObjectStrings(parsed)
+        }
+        return parsed
+      } catch {
+        return data
+      }
+    } else if (Array.isArray(data)) {
+      return data.map((item) => this.parseObjectStrings(item))
+    } else if (typeof data === 'object' && data !== null) {
+      const result: any = {}
+      for (const [key, value] of Object.entries(data)) {
+        result[key] = this.parseObjectStrings(value)
+      }
+      return result
+    }
+    return data
+  }
+
   private parseStatus(status?: string): number {
     if (!status) return HTTP.STATUS.OK
     const parsed = Number(status)

apps/sim/executor/handlers/response/response-handler.ts

@@ -1,7 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { BlockType, HTTP, REFERENCE } from '@/executor/constants'
 import type { BlockHandler, ExecutionContext, NormalizedBlockOutput } from '@/executor/types'
-import { parseObjectStrings } from '@/executor/utils/json'
 import type { SerializedBlock } from '@/serializer/types'
 
 const logger = createLogger('ResponseBlockHandler')
@@ -74,7 +73,7 @@ export class ResponseBlockHandler implements BlockHandler {
 
     if (dataMode === 'structured' && inputs.builderData) {
       const convertedData = this.convertBuilderDataToJson(inputs.builderData)
-      return parseObjectStrings(convertedData)
+      return this.parseObjectStrings(convertedData)
     }
 
     return inputs.data || {}
@@ -223,6 +222,29 @@ export class ResponseBlockHandler implements BlockHandler {
     )
   }
 
+  private parseObjectStrings(data: any): any {
+    if (typeof data === 'string') {
+      try {
+        const parsed = JSON.parse(data)
+        if (typeof parsed === 'object' && parsed !== null) {
+          return this.parseObjectStrings(parsed)
+        }
+        return parsed
+      } catch {
+        return data
+      }
+    } else if (Array.isArray(data)) {
+      return data.map((item) => this.parseObjectStrings(item))
+    } else if (typeof data === 'object' && data !== null) {
+      const result: any = {}
+      for (const [key, value] of Object.entries(data)) {
+        result[key] = this.parseObjectStrings(value)
+      }
+      return result
+    }
+    return data
+  }
+
   private parseStatus(status?: string): number {
     if (!status) return HTTP.STATUS.OK
     const parsed = Number(status)

apps/sim/executor/utils/json.ts

@@ -40,30 +40,3 @@ export function isJSONString(value: string): boolean {
   const trimmed = value.trim()
   return trimmed.startsWith('{') || trimmed.startsWith('[')
 }
-
-/**
- * Recursively parses JSON strings within an object or array.
- * Useful for normalizing data that may contain stringified JSON at various levels.
- */
-export function parseObjectStrings(data: unknown): unknown {
-  if (typeof data === 'string') {
-    try {
-      const parsed = JSON.parse(data)
-      if (typeof parsed === 'object' && parsed !== null) {
-        return parseObjectStrings(parsed)
-      }
-      return parsed
-    } catch {
-      return data
-    }
-  } else if (Array.isArray(data)) {
-    return data.map((item) => parseObjectStrings(item))
-  } else if (typeof data === 'object' && data !== null) {
-    const result: Record<string, unknown> = {}
-    for (const [key, value] of Object.entries(data)) {
-      result[key] = parseObjectStrings(value)
-    }
-    return result
-  }
-  return data
-}