styling

- Resolve merge conflicts in input-format.tsx, workflow-block.tsx, providers/utils.ts
- Fix tests to use blockData/blockNameMapping for tag variable resolution
- Add getBlockOutputs mock to block.test.ts for schema validation tests
- Fix normalizeName import path in utils.test.ts
- Add sql.raw and sql.join to drizzle-orm mock for sql.test.ts
- Add new subBlock types (table-selector, filter-builder, sort-builder) to blocks.test.ts

apps/docs/components/icons.tsx

@@ -4696,6 +4696,26 @@ 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,6 +108,7 @@ import {
   StagehandIcon,
   StripeIcon,
   SupabaseIcon,
+  TableIcon,
   TavilyIcon,
   TelegramIcon,
   TextractIcon,
@@ -236,6 +237,7 @@ 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,6 +104,7 @@
     "stripe",
     "stt",
     "supabase",
+    "table",
     "tavily",
     "telegram",
     "textract",

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

@@ -0,0 +1,351 @@
+---
+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

@@ -2,9 +2,10 @@
 
 import { useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { Eye, EyeOff } from 'lucide-react'
+import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
+import { Button } from '@/components/ui/button'
 import {
   Dialog,
   DialogContent,
@@ -21,7 +22,6 @@ import { getBaseUrl } from '@/lib/core/utils/urls'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
 import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
@@ -107,6 +107,7 @@ export default function LoginPage({
   const [passwordErrors, setPasswordErrors] = useState<string[]>([])
   const [showValidationError, setShowValidationError] = useState(false)
   const buttonClass = useBrandedButtonClass()
+  const [isButtonHovered, setIsButtonHovered] = useState(false)
 
   const [callbackUrl, setCallbackUrl] = useState('/workspace')
   const [isInviteFlow, setIsInviteFlow] = useState(false)
@@ -114,6 +115,7 @@ export default function LoginPage({
   const [forgotPasswordOpen, setForgotPasswordOpen] = useState(false)
   const [forgotPasswordEmail, setForgotPasswordEmail] = useState('')
   const [isSubmittingReset, setIsSubmittingReset] = useState(false)
+  const [isResetButtonHovered, setIsResetButtonHovered] = useState(false)
   const [resetStatus, setResetStatus] = useState<{
     type: 'success' | 'error' | null
     message: string
@@ -182,13 +184,6 @@ export default function LoginPage({
     e.preventDefault()
     setIsLoading(true)
 
-    const redirectToVerify = (emailToVerify: string) => {
-      if (typeof window !== 'undefined') {
-        sessionStorage.setItem('verificationEmail', emailToVerify)
-      }
-      router.push('/verify')
-    }
-
     const formData = new FormData(e.currentTarget)
     const emailRaw = formData.get('email') as string
     const email = emailRaw.trim().toLowerCase()
@@ -220,9 +215,9 @@ 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
-              redirectToVerify(email)
               return
             }
 
@@ -290,7 +285,10 @@ export default function LoginPage({
       router.push(safeCallbackUrl)
     } catch (err: any) {
       if (err.message?.includes('not verified') || err.code?.includes('EMAIL_NOT_VERIFIED')) {
-        redirectToVerify(email)
+        if (typeof window !== 'undefined') {
+          sessionStorage.setItem('verificationEmail', email)
+        }
+        router.push('/verify')
         return
       }
 
@@ -493,14 +491,24 @@ export default function LoginPage({
             </div>
           </div>
 
-          <BrandedButton
+          <Button
             type='submit'
+            onMouseEnter={() => setIsButtonHovered(true)}
+            onMouseLeave={() => setIsButtonHovered(false)}
+            className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
             disabled={isLoading}
-            loading={isLoading}
-            loadingText='Signing in'
           >
-            Sign in
-          </BrandedButton>
+            <span className='flex items-center gap-1'>
+              {isLoading ? 'Signing in...' : 'Sign in'}
+              <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+                {isButtonHovered ? (
+                  <ArrowRight className='h-4 w-4' aria-hidden='true' />
+                ) : (
+                  <ChevronRight className='h-4 w-4' aria-hidden='true' />
+                )}
+              </span>
+            </span>
+          </Button>
         </form>
       )}
 
@@ -611,15 +619,25 @@ export default function LoginPage({
                 <p>{resetStatus.message}</p>
               </div>
             )}
-            <BrandedButton
+            <Button
               type='button'
               onClick={handleForgotPassword}
+              onMouseEnter={() => setIsResetButtonHovered(true)}
+              onMouseLeave={() => setIsResetButtonHovered(false)}
+              className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
               disabled={isSubmittingReset}
-              loading={isSubmittingReset}
-              loadingText='Sending'
             >
-              Send Reset Link
-            </BrandedButton>
+              <span className='flex items-center gap-1'>
+                {isSubmittingReset ? 'Sending...' : 'Send Reset Link'}
+                <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+                  {isResetButtonHovered ? (
+                    <ArrowRight className='h-4 w-4' aria-hidden='true' />
+                  ) : (
+                    <ChevronRight className='h-4 w-4' aria-hidden='true' />
+                  )}
+                </span>
+              </span>
+            </Button>
           </div>
         </DialogContent>
       </Dialog>

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

@@ -1,12 +1,13 @@
 'use client'
 
 import { useState } from 'react'
-import { Eye, EyeOff } from 'lucide-react'
+import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/core/utils/cn'
 import { inter } from '@/app/_styles/fonts/inter/inter'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'
+import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
 
 interface RequestResetFormProps {
   email: string
@@ -27,6 +28,9 @@ export function RequestResetForm({
   statusMessage,
   className,
 }: RequestResetFormProps) {
+  const buttonClass = useBrandedButtonClass()
+  const [isButtonHovered, setIsButtonHovered] = useState(false)
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     onSubmit(email)
@@ -64,14 +68,24 @@ export function RequestResetForm({
         )}
       </div>
 
-      <BrandedButton
+      <Button
         type='submit'
         disabled={isSubmitting}
-        loading={isSubmitting}
-        loadingText='Sending'
+        onMouseEnter={() => setIsButtonHovered(true)}
+        onMouseLeave={() => setIsButtonHovered(false)}
+        className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
       >
-        Send Reset Link
-      </BrandedButton>
+        <span className='flex items-center gap-1'>
+          {isSubmitting ? 'Sending...' : 'Send Reset Link'}
+          <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+            {isButtonHovered ? (
+              <ArrowRight className='h-4 w-4' aria-hidden='true' />
+            ) : (
+              <ChevronRight className='h-4 w-4' aria-hidden='true' />
+            )}
+          </span>
+        </span>
+      </Button>
     </form>
   )
 }
@@ -98,6 +112,8 @@ export function SetNewPasswordForm({
   const [validationMessage, setValidationMessage] = useState('')
   const [showPassword, setShowPassword] = useState(false)
   const [showConfirmPassword, setShowConfirmPassword] = useState(false)
+  const buttonClass = useBrandedButtonClass()
+  const [isButtonHovered, setIsButtonHovered] = useState(false)
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -227,14 +243,24 @@ export function SetNewPasswordForm({
         )}
       </div>
 
-      <BrandedButton
-        type='submit'
+      <Button
         disabled={isSubmitting || !token}
-        loading={isSubmitting}
-        loadingText='Resetting'
+        type='submit'
+        onMouseEnter={() => setIsButtonHovered(true)}
+        onMouseLeave={() => setIsButtonHovered(false)}
+        className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
       >
-        Reset Password
-      </BrandedButton>
+        <span className='flex items-center gap-1'>
+          {isSubmitting ? 'Resetting...' : 'Reset Password'}
+          <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+            {isButtonHovered ? (
+              <ArrowRight className='h-4 w-4' aria-hidden='true' />
+            ) : (
+              <ChevronRight className='h-4 w-4' aria-hidden='true' />
+            )}
+          </span>
+        </span>
+      </Button>
     </form>
   )
 }

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

@@ -2,9 +2,10 @@
 
 import { Suspense, useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { Eye, EyeOff } from 'lucide-react'
+import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { client, useSession } from '@/lib/auth/auth-client'
@@ -13,7 +14,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 { BrandedButton } from '@/app/(auth)/components/branded-button'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
 import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
@@ -97,6 +97,7 @@ function SignupFormContent({
   const [redirectUrl, setRedirectUrl] = useState('')
   const [isInviteFlow, setIsInviteFlow] = useState(false)
   const buttonClass = useBrandedButtonClass()
+  const [isButtonHovered, setIsButtonHovered] = useState(false)
 
   const [name, setName] = useState('')
   const [nameErrors, setNameErrors] = useState<string[]>([])
@@ -475,14 +476,24 @@ function SignupFormContent({
             </div>
           </div>
 
-          <BrandedButton
+          <Button
             type='submit'
+            onMouseEnter={() => setIsButtonHovered(true)}
+            onMouseLeave={() => setIsButtonHovered(false)}
+            className='group inline-flex w-full items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all'
             disabled={isLoading}
-            loading={isLoading}
-            loadingText='Creating account'
           >
-            Create account
-          </BrandedButton>
+            <span className='flex items-center gap-1'>
+              {isLoading ? 'Creating account' : 'Create account'}
+              <span className='inline-flex transition-transform duration-200 group-hover:translate-x-0.5'>
+                {isButtonHovered ? (
+                  <ArrowRight className='h-4 w-4' aria-hidden='true' />
+                ) : (
+                  <ChevronRight className='h-4 w-4' aria-hidden='true' />
+                )}
+              </span>
+            </span>
+          </Button>
         </form>
       )}
 

apps/sim/app/(landing)/careers/page.tsx

@@ -4,6 +4,7 @@ import { useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { X } from 'lucide-react'
 import { Textarea } from '@/components/emcn'
+import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import {
@@ -17,7 +18,6 @@ import { isHosted } from '@/lib/core/config/feature-flags'
 import { cn } from '@/lib/core/utils/cn'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedButton } from '@/app/(auth)/components/branded-button'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Nav from '@/app/(landing)/components/nav/nav'
 
@@ -493,17 +493,18 @@ export default function CareersPage() {
 
               {/* Submit Button */}
               <div className='flex justify-end pt-2'>
-                <BrandedButton
+                <Button
                   type='submit'
                   disabled={isSubmitting || submitStatus === 'success'}
-                  loading={isSubmitting}
-                  loadingText='Submitting'
-                  showArrow={false}
-                  fullWidth={false}
-                  className='min-w-[200px]'
+                  className='min-w-[200px] rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all duration-300 hover:opacity-90 disabled:opacity-50'
+                  size='lg'
                 >
-                  {submitStatus === 'success' ? 'Submitted' : 'Submit Application'}
-                </BrandedButton>
+                  {isSubmitting
+                    ? 'Submitting...'
+                    : submitStatus === 'success'
+                      ? 'Submitted'
+                      : 'Submit Application'}
+                </Button>
               </div>
             </form>
           </section>

apps/sim/app/(landing)/components/nav/nav.tsx

@@ -11,7 +11,6 @@ import { useBrandConfig } from '@/lib/branding/branding'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
 
 const logger = createLogger('nav')
 
@@ -21,12 +20,11 @@ interface NavProps {
 }
 
 export default function Nav({ hideAuthButtons = false, variant = 'landing' }: NavProps = {}) {
-  const [githubStars, setGithubStars] = useState('25.8k')
+  const [githubStars, setGithubStars] = useState('25.1k')
   const [isHovered, setIsHovered] = useState(false)
   const [isLoginHovered, setIsLoginHovered] = useState(false)
   const router = useRouter()
   const brand = useBrandConfig()
-  const buttonClass = useBrandedButtonClass()
 
   useEffect(() => {
     if (variant !== 'landing') return
@@ -185,7 +183,7 @@ export default function Nav({ hideAuthButtons = false, variant = 'landing' }: Na
             href='/signup'
             onMouseEnter={() => setIsHovered(true)}
             onMouseLeave={() => setIsHovered(false)}
-            className={`${buttonClass} group inline-flex items-center justify-center gap-2 rounded-[10px] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white transition-all`}
+            className='group inline-flex items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[14px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all sm:text-[16px]'
             aria-label='Get started with Sim - Sign up for free'
             prefetch={true}
           >

apps/sim/app/api/auth/oauth/utils.ts

@@ -4,11 +4,6 @@ import { createLogger } from '@sim/logger'
 import { and, desc, eq, inArray } from 'drizzle-orm'
 import { getSession } from '@/lib/auth'
 import { refreshOAuthToken } from '@/lib/oauth'
-import {
-  getMicrosoftRefreshTokenExpiry,
-  isMicrosoftProvider,
-  PROACTIVE_REFRESH_THRESHOLD_DAYS,
-} from '@/lib/oauth/microsoft'
 
 const logger = createLogger('OAuthUtilsAPI')
 
@@ -210,32 +205,15 @@ export async function refreshAccessTokenIfNeeded(
   }
 
   // Decide if we should refresh: token missing OR expired
-  const accessTokenExpiresAt = credential.accessTokenExpiresAt
-  const refreshTokenExpiresAt = credential.refreshTokenExpiresAt
+  const expiresAt = credential.accessTokenExpiresAt
   const now = new Date()
-
-  // Check if access token needs refresh (missing or expired)
-  const accessTokenNeedsRefresh =
-    !!credential.refreshToken &&
-    (!credential.accessToken || (accessTokenExpiresAt && accessTokenExpiresAt <= now))
-
-  // Check if we should proactively refresh to prevent refresh token expiry
-  // This applies to Microsoft providers whose refresh tokens expire after 90 days of inactivity
-  const proactiveRefreshThreshold = new Date(
-    now.getTime() + PROACTIVE_REFRESH_THRESHOLD_DAYS * 24 * 60 * 60 * 1000
-  )
-  const refreshTokenNeedsProactiveRefresh =
-    !!credential.refreshToken &&
-    isMicrosoftProvider(credential.providerId) &&
-    refreshTokenExpiresAt &&
-    refreshTokenExpiresAt <= proactiveRefreshThreshold
-
-  const shouldRefresh = accessTokenNeedsRefresh || refreshTokenNeedsProactiveRefresh
+  const shouldRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (expiresAt && expiresAt <= now))
 
   const accessToken = credential.accessToken
 
   if (shouldRefresh) {
-    logger.info(`[${requestId}] Refreshing token for credential`)
+    logger.info(`[${requestId}] Token expired, attempting to refresh for credential`)
     try {
       const refreshedToken = await refreshOAuthToken(
         credential.providerId,
@@ -249,15 +227,11 @@ export async function refreshAccessTokenIfNeeded(
           userId: credential.userId,
           hasRefreshToken: !!credential.refreshToken,
         })
-        if (!accessTokenNeedsRefresh && accessToken) {
-          logger.info(`[${requestId}] Proactive refresh failed but access token still valid`)
-          return accessToken
-        }
         return null
       }
 
       // Prepare update data
-      const updateData: Record<string, unknown> = {
+      const updateData: any = {
         accessToken: refreshedToken.accessToken,
         accessTokenExpiresAt: new Date(Date.now() + refreshedToken.expiresIn * 1000),
         updatedAt: new Date(),
@@ -269,10 +243,6 @@ export async function refreshAccessTokenIfNeeded(
         updateData.refreshToken = refreshedToken.refreshToken
       }
 
-      if (isMicrosoftProvider(credential.providerId)) {
-        updateData.refreshTokenExpiresAt = getMicrosoftRefreshTokenExpiry()
-      }
-
       // Update the token in the database
       await db.update(account).set(updateData).where(eq(account.id, credentialId))
 
@@ -286,10 +256,6 @@ export async function refreshAccessTokenIfNeeded(
         credentialId,
         userId: credential.userId,
       })
-      if (!accessTokenNeedsRefresh && accessToken) {
-        logger.info(`[${requestId}] Proactive refresh failed but access token still valid`)
-        return accessToken
-      }
       return null
     }
   } else if (!accessToken) {
@@ -311,27 +277,10 @@ export async function refreshTokenIfNeeded(
   credentialId: string
 ): Promise<{ accessToken: string; refreshed: boolean }> {
   // Decide if we should refresh: token missing OR expired
-  const accessTokenExpiresAt = credential.accessTokenExpiresAt
-  const refreshTokenExpiresAt = credential.refreshTokenExpiresAt
+  const expiresAt = credential.accessTokenExpiresAt
   const now = new Date()
-
-  // Check if access token needs refresh (missing or expired)
-  const accessTokenNeedsRefresh =
-    !!credential.refreshToken &&
-    (!credential.accessToken || (accessTokenExpiresAt && accessTokenExpiresAt <= now))
-
-  // Check if we should proactively refresh to prevent refresh token expiry
-  // This applies to Microsoft providers whose refresh tokens expire after 90 days of inactivity
-  const proactiveRefreshThreshold = new Date(
-    now.getTime() + PROACTIVE_REFRESH_THRESHOLD_DAYS * 24 * 60 * 60 * 1000
-  )
-  const refreshTokenNeedsProactiveRefresh =
-    !!credential.refreshToken &&
-    isMicrosoftProvider(credential.providerId) &&
-    refreshTokenExpiresAt &&
-    refreshTokenExpiresAt <= proactiveRefreshThreshold
-
-  const shouldRefresh = accessTokenNeedsRefresh || refreshTokenNeedsProactiveRefresh
+  const shouldRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (expiresAt && expiresAt <= now))
 
   // If token appears valid and present, return it directly
   if (!shouldRefresh) {
@@ -344,17 +293,13 @@ export async function refreshTokenIfNeeded(
 
     if (!refreshResult) {
       logger.error(`[${requestId}] Failed to refresh token for credential`)
-      if (!accessTokenNeedsRefresh && credential.accessToken) {
-        logger.info(`[${requestId}] Proactive refresh failed but access token still valid`)
-        return { accessToken: credential.accessToken, refreshed: false }
-      }
       throw new Error('Failed to refresh token')
     }
 
     const { accessToken: refreshedToken, expiresIn, refreshToken: newRefreshToken } = refreshResult
 
     // Prepare update data
-    const updateData: Record<string, unknown> = {
+    const updateData: any = {
       accessToken: refreshedToken,
       accessTokenExpiresAt: new Date(Date.now() + expiresIn * 1000), // Use provider's expiry
       updatedAt: new Date(),
@@ -366,10 +311,6 @@ export async function refreshTokenIfNeeded(
       updateData.refreshToken = newRefreshToken
     }
 
-    if (isMicrosoftProvider(credential.providerId)) {
-      updateData.refreshTokenExpiresAt = getMicrosoftRefreshTokenExpiry()
-    }
-
     await db.update(account).set(updateData).where(eq(account.id, credentialId))
 
     logger.info(`[${requestId}] Successfully refreshed access token`)
@@ -390,11 +331,6 @@ export async function refreshTokenIfNeeded(
       }
     }
 
-    if (!accessTokenNeedsRefresh && credential.accessToken) {
-      logger.info(`[${requestId}] Proactive refresh failed but access token still valid`)
-      return { accessToken: credential.accessToken, refreshed: false }
-    }
-
     logger.error(`[${requestId}] Refresh failed and no valid token found in DB`, error)
     throw error
   }

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

@@ -0,0 +1,138 @@
+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

@@ -0,0 +1,276 @@
+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

@@ -0,0 +1,681 @@
+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

@@ -0,0 +1,182 @@
+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

@@ -0,0 +1,293 @@
+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

@@ -0,0 +1,188 @@
+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,6 +11,7 @@ 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'
 
@@ -60,6 +61,7 @@ interface RequestBody {
   history?: ChatMessage[]
   workflowId?: string
   generationType?: string
+  wandContext?: Record<string, unknown>
 }
 
 function safeStringify(value: unknown): string {
@@ -70,6 +72,38 @@ 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: {
@@ -159,7 +193,15 @@ export async function POST(req: NextRequest) {
   try {
     const body = (await req.json()) as RequestBody
 
-    const { prompt, systemPrompt, stream = false, history = [], workflowId, generationType } = body
+    const {
+      prompt,
+      systemPrompt,
+      stream = false,
+      history = [],
+      workflowId,
+      generationType,
+      wandContext = {},
+    } = body
 
     if (!prompt) {
       logger.warn(`[${requestId}] Invalid request: Missing prompt.`)
@@ -227,20 +269,15 @@ export async function POST(req: NextRequest) {
       systemPrompt ||
       'You are a helpful AI assistant. Generate content exactly as requested by the user.'
 
-    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
+    // 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 === 'json-object') {

apps/sim/app/changelog/components/branded-link.tsx

@@ -1,27 +0,0 @@
-'use client'
-
-import Link from 'next/link'
-import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'
-
-interface BrandedLinkProps {
-  href: string
-  children: React.ReactNode
-  className?: string
-  target?: string
-  rel?: string
-}
-
-export function BrandedLink({ href, children, className = '', target, rel }: BrandedLinkProps) {
-  const buttonClass = useBrandedButtonClass()
-
-  return (
-    <Link
-      href={href}
-      target={target}
-      rel={rel}
-      className={`${buttonClass} group inline-flex items-center justify-center gap-2 rounded-[10px] py-[6px] pr-[10px] pl-[12px] text-[15px] text-white transition-all ${className}`}
-    >
-      {children}
-    </Link>
-  )
-}

apps/sim/app/changelog/components/changelog-content.tsx

@@ -2,7 +2,6 @@ import { BookOpen, Github, Rss } from 'lucide-react'
 import Link from 'next/link'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
-import { BrandedLink } from '@/app/changelog/components/branded-link'
 import ChangelogList from '@/app/changelog/components/timeline-list'
 
 export interface ChangelogEntry {
@@ -67,24 +66,25 @@ export default async function ChangelogContent() {
             <hr className='mt-6 border-border' />
 
             <div className='mt-6 flex flex-wrap items-center gap-3 text-sm'>
-              <BrandedLink
+              <Link
                 href='https://github.com/simstudioai/sim/releases'
                 target='_blank'
                 rel='noopener noreferrer'
+                className='group inline-flex items-center justify-center gap-2 rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] py-[6px] pr-[10px] pl-[12px] text-[14px] text-white shadow-[inset_0_2px_4px_0_#9B77FF] transition-all sm:text-[16px]'
               >
                 <Github className='h-4 w-4' />
                 View on GitHub
-              </BrandedLink>
+              </Link>
               <Link
                 href='https://docs.sim.ai'
-                className='inline-flex items-center gap-2 rounded-[10px] border border-border py-[6px] pr-[10px] pl-[12px] text-[15px] transition-all hover:bg-muted'
+                className='inline-flex items-center gap-2 rounded-md border border-border px-3 py-1.5 hover:bg-muted'
               >
                 <BookOpen className='h-4 w-4' />
                 Documentation
               </Link>
               <Link
                 href='/changelog.xml'
-                className='inline-flex items-center gap-2 rounded-[10px] border border-border py-[6px] pr-[10px] pl-[12px] text-[15px] transition-all hover:bg-muted'
+                className='inline-flex items-center gap-2 rounded-md border border-border px-3 py-1.5 hover:bg-muted'
               >
                 <Rss className='h-4 w-4' />
                 RSS Feed

apps/sim/app/chat/[identifier]/chat.tsx

@@ -117,7 +117,7 @@ export default function ChatClient({ identifier }: { identifier: string }) {
   const [error, setError] = useState<string | null>(null)
   const messagesEndRef = useRef<HTMLDivElement>(null)
   const messagesContainerRef = useRef<HTMLDivElement>(null)
-  const [starCount, setStarCount] = useState('25.8k')
+  const [starCount, setStarCount] = useState('25.1k')
   const [conversationId, setConversationId] = useState('')
 
   const [showScrollButton, setShowScrollButton] = useState(false)

apps/sim/app/templates/components/template-card.tsx

@@ -207,6 +207,7 @@ function TemplateCardInner({
             isPannable={false}
             defaultZoom={0.8}
             fitPadding={0.2}
+            lightweight
           />
         ) : (
           <div className='h-full w-full bg-[var(--surface-4)]' />

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='tertiary'
+                          variant={canSaveTag ? 'tertiary' : 'default'}
                           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='tertiary'
+                  variant={hasUnsavedChanges ? 'tertiary' : 'default'}
                   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,6 +39,9 @@ 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)
@@ -123,7 +126,11 @@ export function RenameDocumentModal({
                 >
                   Cancel
                 </Button>
-                <Button variant='tertiary' type='submit' disabled={isSubmitting || !name?.trim()}>
+                <Button
+                  variant={hasChanges ? 'tertiary' : 'default'}
+                  type='submit'
+                  disabled={isSubmitting || !name?.trim() || !hasChanges}
+                >
                   {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, useState } from 'react'
+import { useCallback, useRef, useState } from 'react'
 import { useParams, useRouter } from 'next/navigation'
-import { Badge, DocumentAttachment, Tooltip } from '@/components/emcn'
+import { Badge, Button, 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,6 +143,7 @@ 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,
@@ -151,6 +152,23 @@ 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) {
@@ -223,9 +241,24 @@ export function BaseCard({
             <h3 className='min-w-0 flex-1 truncate font-medium text-[14px] text-[var(--text-primary)]'>
               {title}
             </h3>
-            {shortId && (
-              <Badge className='flex-shrink-0 rounded-[4px] text-[12px]'>{shortId}</Badge>
-            )}
+            <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>
           </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,6 +70,12 @@ 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) {
@@ -159,9 +165,9 @@ export function EditKnowledgeBaseModal({
                   Cancel
                 </Button>
                 <Button
-                  variant='tertiary'
+                  variant={hasChanges ? 'tertiary' : 'default'}
                   type='submit'
-                  disabled={isSubmitting || !nameValue?.trim()}
+                  disabled={isSubmitting || !nameValue?.trim() || !hasChanges}
                 >
                   {isSubmitting ? 'Saving...' : 'Save'}
                 </Button>

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

@@ -265,12 +265,11 @@ export function Knowledge() {
                   </div>
                 </div>
               ) : error ? (
-                <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 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>
                 </div>
               ) : (

apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/execution-snapshot/execution-snapshot.tsx

@@ -16,8 +16,8 @@ import {
 import { redactApiKeys } from '@/lib/core/security/redaction'
 import { cn } from '@/lib/core/utils/cn'
 import {
+  BlockDetailsSidebar,
   getLeftmostBlockId,
-  PreviewEditor,
   WorkflowPreview,
 } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useExecutionSnapshot } from '@/hooks/queries/logs'
@@ -248,10 +248,11 @@ export function ExecutionSnapshot({
             cursorStyle='pointer'
             executedBlocks={blockExecutions}
             selectedBlockId={pinnedBlockId}
+            lightweight
           />
         </div>
         {pinnedBlockId && workflowState.blocks[pinnedBlockId] && (
-          <PreviewEditor
+          <BlockDetailsSidebar
             block={workflowState.blocks[pinnedBlockId]}
             executionData={blockExecutions[pinnedBlockId]}
             allBlockExecutions={blockExecutions}

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

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,99 @@
+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

@@ -0,0 +1,84 @@
+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

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,207 @@
+'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

@@ -0,0 +1,41 @@
+'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

@@ -0,0 +1,169 @@
+'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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,399 @@
+'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

@@ -0,0 +1,79 @@
+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

@@ -0,0 +1,194 @@
+'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

@@ -0,0 +1,331 @@
+'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

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,192 @@
+'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

@@ -0,0 +1,56 @@
+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

@@ -0,0 +1,86 @@
+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

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

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

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

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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,21 @@
+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

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

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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,349 @@
+'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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,152 @@
+'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

@@ -0,0 +1,233 @@
+'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

@@ -0,0 +1,76 @@
+'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

@@ -0,0 +1,197 @@
+'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

@@ -0,0 +1,7 @@
+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

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

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

@@ -0,0 +1,83 @@
+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

@@ -0,0 +1,26 @@
+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/components/template-card.tsx

@@ -213,6 +213,7 @@ function TemplateCardInner({
             isPannable={false}
             defaultZoom={0.8}
             fitPadding={0.2}
+            lightweight
             cursorStyle='pointer'
           />
         ) : (

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

@@ -212,8 +212,10 @@ 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-muted-foreground text-sm'>{emptyState.title}</p>
-                  <p className='mt-1 text-muted-foreground/70 text-xs'>{emptyState.description}</p>
+                  <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>
                 </div>
               </div>
             ) : (

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/general.tsx

@@ -18,8 +18,8 @@ import {
 import { Skeleton } from '@/components/ui'
 import type { WorkflowDeploymentVersionResponse } from '@/lib/workflows/persistence/utils'
 import {
+  BlockDetailsSidebar,
   getLeftmostBlockId,
-  PreviewEditor,
   WorkflowPreview,
 } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useDeploymentVersionState, useRevertToVersion } from '@/hooks/queries/workflows'
@@ -337,7 +337,7 @@ export function GeneralDeploy({
                   />
                 </div>
                 {expandedSelectedBlockId && workflowToShow.blocks?.[expandedSelectedBlockId] && (
-                  <PreviewEditor
+                  <BlockDetailsSidebar
                     block={workflowToShow.blocks[expandedSelectedBlockId]}
                     workflowVariables={workflowToShow.variables}
                     loops={workflowToShow.loops}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx

@@ -446,6 +446,7 @@ const OGCaptureContainer = forwardRef<HTMLDivElement>((_, ref) => {
         isPannable={false}
         defaultZoom={0.8}
         fitPadding={0.2}
+        lightweight
       />
     </div>
   )

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

@@ -246,6 +246,7 @@ 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...'
@@ -270,9 +271,14 @@ 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/filter-builder/components/empty-state.tsx

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,137 @@
+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

@@ -0,0 +1,90 @@
+'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/index.ts

@@ -9,6 +9,7 @@ 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'
@@ -26,12 +27,13 @@ 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'
 export { VariablesInput } from './variables-input/variables-input'
-export { WorkflowSelectorInput } from './workflow-selector/workflow-selector-input'

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

@@ -2,13 +2,12 @@ import { useMemo, useRef, useState } from 'react'
 import { Badge, Input } from '@/components/emcn'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/core/utils/cn'
-import { extractInputFieldsFromBlocks } from '@/lib/workflows/input-format'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
 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 { useWorkflowState } from '@/hooks/queries/workflows'
+import { useWorkflowInputFields } from '@/hooks/queries/workflows'
 
 /**
  * Props for the InputMappingField component
@@ -71,11 +70,7 @@ export function InputMapping({
   const overlayRefs = useRef<Map<string, HTMLDivElement>>(new Map())
 
   const workflowId = typeof selectedWorkflowId === 'string' ? selectedWorkflowId : undefined
-  const { data: workflowState, isLoading } = useWorkflowState(workflowId)
-  const childInputFields = useMemo(
-    () => (workflowState?.blocks ? extractInputFieldsFromBlocks(workflowState.blocks) : []),
-    [workflowState?.blocks]
-  )
+  const { data: childInputFields = [], isLoading } = useWorkflowInputFields(workflowId)
   const [collapsedFields, setCollapsedFields] = useState<Record<string, boolean>>({})
 
   const valueObj: Record<string, string> = useMemo(() => {

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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,67 @@
+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

@@ -0,0 +1,110 @@
+'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

@@ -0,0 +1,80 @@
+'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?: TableRow[] | null
+  previewValue?: WorkflowTableRow[] | null
   disabled?: boolean
 }
 
-interface TableRow {
+interface WorkflowTableRow {
   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<TableRow[]>(blockId, subBlockId)
+  const [storeValue, setStoreValue] = useSubBlockValue<WorkflowTableRow[]>(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: TableRow = {
+      const initialRow: WorkflowTableRow = {
         id: crypto.randomUUID(),
         cells: { ...emptyCellsTemplate },
       }
@@ -110,7 +110,7 @@ export function Table({
       }
     })
 
-    return validatedRows as TableRow[]
+    return validatedRows as WorkflowTableRow[]
   }, [value, emptyCellsTemplate])
 
   // Helper to update a cell value
@@ -164,7 +164,12 @@ export function Table({
     </thead>
   )
 
-  const renderCell = (row: TableRow, rowIndex: number, column: string, cellIndex: number) => {
+  const renderCell = (
+    row: WorkflowTableRow,
+    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/tool-input/tool-input.tsx

@@ -29,7 +29,6 @@ import {
   type OAuthProvider,
   type OAuthService,
 } from '@/lib/oauth'
-import { extractInputFieldsFromBlocks } from '@/lib/workflows/input-format'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
   CheckboxList,
@@ -44,6 +43,7 @@ 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'
@@ -66,7 +66,7 @@ import { useForceRefreshMcpTools, useMcpServers, useStoredMcpTools } from '@/hoo
 import {
   useChildDeploymentStatus,
   useDeployChildWorkflow,
-  useWorkflowState,
+  useWorkflowInputFields,
   useWorkflows,
 } from '@/hooks/queries/workflows'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
@@ -509,6 +509,40 @@ 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,
@@ -772,11 +806,7 @@ function WorkflowInputMapperSyncWrapper({
   disabled: boolean
   workflowId: string
 }) {
-  const { data: workflowState, isLoading } = useWorkflowState(workflowId)
-  const inputFields = useMemo(
-    () => (workflowState?.blocks ? extractInputFieldsFromBlocks(workflowState.blocks) : []),
-    [workflowState?.blocks]
-  )
+  const { data: inputFields = [], isLoading } = useWorkflowInputFields(workflowId)
 
   const parsedValue = useMemo(() => {
     try {
@@ -970,6 +1000,7 @@ const BUILT_IN_TOOL_TYPES = new Set([
   'tts',
   'stt',
   'memory',
+  'table',
   'webhook_request',
   'workflow',
 ])
@@ -1147,7 +1178,8 @@ export const ToolInput = memo(function ToolInput({
           block.type === 'workflow' ||
           block.type === 'workflow_input' ||
           block.type === 'knowledge' ||
-          block.type === 'function') &&
+          block.type === 'function' ||
+          block.type === 'table') &&
         block.type !== 'evaluator' &&
         block.type !== 'mcp' &&
         block.type !== 'file'
@@ -2145,6 +2177,19 @@ 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/components/workflow-selector/workflow-selector-input.tsx

@@ -1,45 +0,0 @@
-'use client'
-
-import { useMemo } from 'react'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import type { SubBlockConfig } from '@/blocks/types'
-import type { SelectorContext } from '@/hooks/selectors/types'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-
-interface WorkflowSelectorInputProps {
-  blockId: string
-  subBlock: SubBlockConfig
-  disabled?: boolean
-  isPreview?: boolean
-  previewValue?: string | null
-}
-
-export function WorkflowSelectorInput({
-  blockId,
-  subBlock,
-  disabled = false,
-  isPreview = false,
-  previewValue,
-}: WorkflowSelectorInputProps) {
-  const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
-
-  const context: SelectorContext = useMemo(
-    () => ({
-      excludeWorkflowId: activeWorkflowId ?? undefined,
-    }),
-    [activeWorkflowId]
-  )
-
-  return (
-    <SelectorCombobox
-      blockId={blockId}
-      subBlock={subBlock}
-      selectorKey='sim.workflows'
-      selectorContext={context}
-      disabled={disabled}
-      isPreview={isPreview}
-      previewValue={previewValue}
-      placeholder={subBlock.placeholder || 'Select workflow...'}
-    />
-  )
-}

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

@@ -1,8 +1,10 @@
-import { type JSX, type MouseEvent, memo, useRef, useState } from 'react'
+import { type JSX, type MouseEvent, memo, useCallback, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
-import { AlertTriangle, ArrowLeftRight, ArrowUp } from 'lucide-react'
+import { AlertTriangle, ArrowLeftRight, ArrowUp, ExternalLink } from 'lucide-react'
+import { useParams } from 'next/navigation'
 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,
@@ -16,6 +18,7 @@ import {
   EvalInput,
   FileSelectorInput,
   FileUpload,
+  FilterBuilder,
   FolderSelectorInput,
   GroupedCheckboxList,
   InputFormat,
@@ -34,13 +37,14 @@ import {
   ShortInput,
   SlackSelectorInput,
   SliderInput,
+  SortBuilder,
   Switch,
   Table,
+  TableSelector,
   Text,
   TimeInput,
   ToolInput,
   VariablesInput,
-  WorkflowSelectorInput,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import type { SubBlockConfig } from '@/blocks/types'
@@ -91,6 +95,7 @@ const isFieldRequired = (config: SubBlockConfig, subBlockValues?: Record<string,
   if (!config.required) return false
   if (typeof config.required === 'boolean') return config.required
 
+  // Helper function to evaluate a condition
   const evalCond = (
     cond: {
       field: string
@@ -132,6 +137,7 @@ const isFieldRequired = (config: SubBlockConfig, subBlockValues?: Record<string,
     return match
   }
 
+  // If required is a condition object or function, evaluate it
   const condition = typeof config.required === 'function' ? config.required() : config.required
   return evalCond(condition, subBlockValues || {})
 }
@@ -170,6 +176,7 @@ 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 = (
@@ -195,7 +202,11 @@ const renderLabel = (
     disabled?: boolean
     onToggle?: () => void
   },
-  canonicalToggleIsDisabled?: boolean
+  canonicalToggleIsDisabled?: boolean,
+  tableLinkState?: {
+    hasSelectedTable: boolean
+    onNavigateToTable: () => void
+  }
 ): JSX.Element | null => {
   if (config.type === 'switch') return null
   if (!config.title) return null
@@ -204,6 +215,11 @@ 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]'>
@@ -283,6 +299,23 @@ 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'
@@ -363,6 +396,9 @@ 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('')
@@ -377,8 +413,23 @@ function SubBlockComponent({
     setIsValidJson(isValid)
   }
 
+  // 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.
@@ -436,6 +487,8 @@ function SubBlockComponent({
     | null
     | undefined
 
+  // Use dependsOn gating to compute final disabled state
+  // Only pass previewContextValues when in preview mode to avoid format mismatches
   const { finalDisabled: gatedDisabled } = useDependsOnGate(blockId, config, {
     disabled,
     isPreview,
@@ -511,6 +564,19 @@ 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}>
@@ -853,6 +919,28 @@ 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 (
@@ -865,17 +953,6 @@ function SubBlockComponent({
           />
         )
 
-      case 'workflow-selector':
-        return (
-          <WorkflowSelectorInput
-            blockId={blockId}
-            subBlock={config}
-            disabled={isDisabled}
-            isPreview={isPreview}
-            previewValue={previewValue as string | null}
-          />
-        )
-
       case 'mcp-server-selector':
         return (
           <McpServerSelector
@@ -960,7 +1037,11 @@ function SubBlockComponent({
           searchInputRef,
         },
         canonicalToggle,
-        Boolean(canonicalToggle?.disabled || disabled || isPreview)
+        Boolean(canonicalToggle?.disabled || disabled || isPreview),
+        {
+          hasSelectedTable,
+          onNavigateToTable: handleNavigateToTable,
+        }
       )}
       {renderInput()}
     </div>

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

@@ -68,7 +68,7 @@ export function SubflowEditor({
     <div className='flex flex-1 flex-col overflow-hidden pt-[0px]'>
       {/* Subflow Editor Section */}
       <div ref={subBlocksRef} className='subblocks-section flex flex-1 flex-col overflow-hidden'>
-        <div className='flex-1 overflow-y-auto overflow-x-hidden px-[8px] pt-[9px] pb-[8px]'>
+        <div className='flex-1 overflow-y-auto overflow-x-hidden px-[8px] pt-[5px] pb-[8px]'>
           {/* Type Selection */}
           <div>
             <Label className='mb-[6.5px] block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'>

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

@@ -2,16 +2,7 @@
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { isEqual } from 'lodash'
-import {
-  BookOpen,
-  Check,
-  ChevronDown,
-  ChevronUp,
-  ExternalLink,
-  Loader2,
-  Pencil,
-} from 'lucide-react'
-import { useParams } from 'next/navigation'
+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'
@@ -38,10 +29,8 @@ import { LoopTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/component
 import { ParallelTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/parallel/parallel-config'
 import { getSubBlockStableKey } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { getBlock } from '@/blocks/registry'
 import type { SubBlockType } from '@/blocks/types'
-import { useWorkflowState } from '@/hooks/queries/workflows'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { usePanelEditorStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -96,14 +85,6 @@ export function Editor() {
   // Get subflow display properties from configs
   const subflowConfig = isSubflow ? (currentBlock.type === 'loop' ? LoopTool : ParallelTool) : null
 
-  // Check if selected block is a workflow block
-  const isWorkflowBlock =
-    currentBlock && (currentBlock.type === 'workflow' || currentBlock.type === 'workflow_input')
-
-  // Get workspace ID from params
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
   // Refs for resize functionality
   const subBlocksRef = useRef<HTMLDivElement>(null)
 
@@ -273,11 +254,11 @@ export function Editor() {
 
   // Trigger rename mode when signaled from context menu
   useEffect(() => {
-    if (shouldFocusRename && currentBlock) {
+    if (shouldFocusRename && currentBlock && !isSubflow) {
       handleStartRename()
       setShouldFocusRename(false)
     }
-  }, [shouldFocusRename, currentBlock, handleStartRename, setShouldFocusRename])
+  }, [shouldFocusRename, currentBlock, isSubflow, handleStartRename, setShouldFocusRename])
 
   /**
    * Handles opening documentation link in a new secure tab.
@@ -289,22 +270,6 @@ export function Editor() {
     }
   }
 
-  // Get child workflow ID for workflow blocks
-  const childWorkflowId = isWorkflowBlock ? blockSubBlockValues?.workflowId : null
-
-  // Fetch child workflow state for preview (only for workflow blocks with a selected workflow)
-  const { data: childWorkflowState, isLoading: isLoadingChildWorkflow } =
-    useWorkflowState(childWorkflowId)
-
-  /**
-   * Handles opening the child workflow in a new tab.
-   */
-  const handleOpenChildWorkflow = useCallback(() => {
-    if (childWorkflowId && workspaceId) {
-      window.open(`/workspace/${workspaceId}/w/${childWorkflowId}`, '_blank', 'noopener,noreferrer')
-    }
-  }, [childWorkflowId, workspaceId])
-
   // Determine if connections are at minimum height (collapsed state)
   const isConnectionsAtMinHeight = connectionsHeight <= 35
 
@@ -357,7 +322,7 @@ export function Editor() {
         </div>
         <div className='flex shrink-0 items-center gap-[8px]'>
           {/* Rename button */}
-          {currentBlock && (
+          {currentBlock && !isSubflow && (
             <Tooltip.Root>
               <Tooltip.Trigger asChild>
                 <Button
@@ -443,66 +408,7 @@ export function Editor() {
             className='subblocks-section flex flex-1 flex-col overflow-hidden'
           >
             <div className='flex-1 overflow-y-auto overflow-x-hidden px-[8px] pt-[12px] pb-[8px] [overflow-anchor:none]'>
-              {/* Workflow Preview - only for workflow blocks with a selected child workflow */}
-              {isWorkflowBlock && childWorkflowId && (
-                <>
-                  <div className='subblock-content flex flex-col gap-[9.5px]'>
-                    <div className='pl-[2px] font-medium text-[13px] text-[var(--text-primary)] leading-none'>
-                      Workflow Preview
-                    </div>
-                    <div className='relative h-[160px] overflow-hidden rounded-[4px] border border-[var(--border)]'>
-                      {isLoadingChildWorkflow ? (
-                        <div className='flex h-full items-center justify-center bg-[var(--surface-3)]'>
-                          <Loader2 className='h-5 w-5 animate-spin text-[var(--text-tertiary)]' />
-                        </div>
-                      ) : childWorkflowState ? (
-                        <>
-                          <div className='[&_*:active]:!cursor-grabbing [&_*]:!cursor-grab [&_.react-flow__handle]:!hidden h-full w-full'>
-                            <WorkflowPreview
-                              workflowState={childWorkflowState}
-                              height={160}
-                              width='100%'
-                              isPannable={true}
-                              defaultZoom={0.6}
-                              fitPadding={0.15}
-                              cursorStyle='grab'
-                            />
-                          </div>
-                          <Tooltip.Root>
-                            <Tooltip.Trigger asChild>
-                              <Button
-                                type='button'
-                                variant='ghost'
-                                onClick={handleOpenChildWorkflow}
-                                className='absolute right-[6px] bottom-[6px] z-10 h-[24px] w-[24px] cursor-pointer border border-[var(--border)] bg-[var(--surface-2)] p-0 hover:bg-[var(--surface-4)]'
-                              >
-                                <ExternalLink className='h-[12px] w-[12px]' />
-                              </Button>
-                            </Tooltip.Trigger>
-                            <Tooltip.Content side='top'>Open workflow</Tooltip.Content>
-                          </Tooltip.Root>
-                        </>
-                      ) : (
-                        <div className='flex h-full items-center justify-center bg-[var(--surface-3)]'>
-                          <span className='text-[13px] text-[var(--text-tertiary)]'>
-                            Unable to load preview
-                          </span>
-                        </div>
-                      )}
-                    </div>
-                  </div>
-                  <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
-                    <div
-                      className='h-[1.25px]'
-                      style={{
-                        backgroundImage:
-                          'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
-                      }}
-                    />
-                  </div>
-                </>
-              )}
-              {subBlocks.length === 0 && !isWorkflowBlock ? (
+              {subBlocks.length === 0 ? (
                 <div className='flex h-full items-center justify-center text-center text-[#8D8D8D] text-[13px]'>
                   This block has no subblocks
                 </div>

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

@@ -9,6 +9,7 @@ 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,
@@ -40,6 +41,7 @@ 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'
@@ -54,9 +56,9 @@ const logger = createLogger('WorkflowBlock')
 const EMPTY_SUBBLOCK_VALUES = {} as Record<string, any>
 
 /**
- * Type guard for table row structure
+ * Type guard for workflow table row structure (sub-block table inputs)
  */
-interface TableRow {
+interface WorkflowTableRow {
   id: string
   cells: Record<string, string>
 }
@@ -75,7 +77,7 @@ interface FieldFormat {
 /**
  * Checks if a value is a table row array
  */
-const isTableRowArray = (value: unknown): value is TableRow[] => {
+const isTableRowArray = (value: unknown): value is WorkflowTableRow[] => {
   if (!Array.isArray(value) || value.length === 0) return false
   const firstItem = value[0]
   return (
@@ -94,7 +96,11 @@ 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 === 'object' &&
+    firstItem !== null &&
+    'id' in firstItem &&
+    'name' in firstItem &&
+    typeof firstItem.name === 'string'
   )
 }
 
@@ -160,7 +166,8 @@ const isTagFilterArray = (value: unknown): value is TagFilterItem[] => {
     typeof firstItem === 'object' &&
     firstItem !== null &&
     'tagName' in firstItem &&
-    'tagValue' in firstItem
+    'tagValue' in firstItem &&
+    typeof firstItem.tagName === 'string'
   )
 }
 
@@ -182,7 +189,40 @@ const isDocumentTagArray = (value: unknown): value is DocumentTagItem[] => {
     firstItem !== null &&
     'tagName' in firstItem &&
     'value' in firstItem &&
-    !('tagValue' in firstItem) // Distinguish from tag filters
+    !('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')
   )
 }
 
@@ -230,7 +270,9 @@ export const getDisplayValue = (value: unknown): string => {
   }
 
   if (isTagFilterArray(parsedValue)) {
-    const validFilters = parsedValue.filter((f) => f.tagName?.trim())
+    const validFilters = parsedValue.filter(
+      (f) => typeof f.tagName === 'string' && 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}`
@@ -238,13 +280,54 @@ export const getDisplayValue = (value: unknown): string => {
   }
 
   if (isDocumentTagArray(parsedValue)) {
-    const validTags = parsedValue.filter((t) => t.tagName?.trim())
+    const validTags = parsedValue.filter(
+      (t) => typeof t.tagName === 'string' && 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)
@@ -266,7 +349,9 @@ export const getDisplayValue = (value: unknown): string => {
   }
 
   if (isFieldFormatArray(parsedValue)) {
-    const namedFields = parsedValue.filter((field) => field.name && field.name.trim() !== '')
+    const namedFields = parsedValue.filter(
+      (field) => typeof field.name === 'string' && 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}`
@@ -512,6 +597,15 @@ 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
@@ -618,19 +712,43 @@ 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)
@@ -645,7 +763,10 @@ const SubBlockRow = memo(function SubBlockRow({
       </span>
       {displayValue !== undefined && (
         <span
-          className='flex-1 truncate text-right text-[14px] text-[var(--text-primary)]'
+          className={cn(
+            'flex-1 truncate text-right text-[14px] text-[var(--text-primary)]',
+            isMonospaceField && 'font-mono'
+          )}
           title={displayValue}
         >
           {displayValue}

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

@@ -3,23 +3,37 @@ 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
+ * 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.
  */
-function buildContextInfo(currentValue?: string, generationType?: string): string {
-  if (!currentValue || currentValue.trim() === '') {
-    return 'no current content'
-  }
+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
 
-  const contentLength = currentValue.length
-  const lineCount = currentValue.split('\n').length
+  let contextInfo = hasContent
+    ? `Current content (${contentLength} characters, ${lineCount} lines):\n${currentValue}`
+    : 'no current content'
 
-  let contextInfo = `Current content (${contentLength} characters, ${lineCount} lines):\n${currentValue}`
-
-  if (generationType) {
+  if (generationType && currentValue) {
     switch (generationType) {
       case 'javascript-function-body':
       case 'typescript-function-body': {
@@ -32,6 +46,7 @@ function buildContextInfo(currentValue?: string, generationType?: string): strin
 
       case 'json-schema':
       case 'json-object':
+      case 'table-schema':
         try {
           const parsed = JSON.parse(currentValue)
           const keys = Object.keys(parsed)
@@ -46,11 +61,6 @@ function buildContextInfo(currentValue?: string, generationType?: string): strin
   return contextInfo
 }
 
-interface ChatMessage {
-  role: 'user' | 'assistant' | 'system'
-  content: string
-}
-
 export interface WandConfig {
   enabled: boolean
   prompt: string
@@ -62,6 +72,9 @@ export interface WandConfig {
 interface UseWandProps {
   wandConfig?: WandConfig
   currentValue?: string
+  contextParams?: {
+    tableId?: string | null
+  }
   onGeneratedContent: (content: string) => void
   onStreamChunk?: (chunk: string) => void
   onStreamStart?: () => void
@@ -71,12 +84,14 @@ 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('')
@@ -147,7 +162,10 @@ export function useWand({
       }
 
       try {
-        const contextInfo = buildContextInfo(currentValue, wandConfig?.generationType)
+        const contextInfo = buildWandContextInfo({
+          currentValue,
+          generationType: wandConfig?.generationType,
+        })
 
         let systemPrompt = wandConfig?.prompt || ''
         if (systemPrompt.includes('{context}')) {
@@ -170,6 +188,8 @@ 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',
@@ -276,6 +296,8 @@ export function useWand({
       onStreamStart,
       onGenerationComplete,
       queryClient,
+      contextParams?.tableId,
+      workflowId,
     ]
   )
 

apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block-details-sidebar.tsx

@@ -685,7 +685,7 @@ interface WorkflowVariable {
   value: unknown
 }
 
-interface PreviewEditorProps {
+interface BlockDetailsSidebarProps {
   block: BlockState
   executionData?: ExecutionData
   /** All block execution data for resolving variable references */
@@ -722,7 +722,7 @@ const DEFAULT_CONNECTIONS_HEIGHT = 150
 /**
  * Readonly sidebar panel showing block configuration using SubBlock components.
  */
-function PreviewEditorContent({
+function BlockDetailsSidebarContent({
   block,
   executionData,
   allBlockExecutions,
@@ -732,7 +732,7 @@ function PreviewEditorContent({
   parallels,
   isExecutionMode = false,
   onClose,
-}: PreviewEditorProps) {
+}: BlockDetailsSidebarProps) {
   // Convert Record<string, Variable> to Array<Variable> for iteration
   const normalizedWorkflowVariables = useMemo(() => {
     if (!workflowVariables) return []
@@ -998,22 +998,6 @@ function PreviewEditorContent({
     })
   }, [extractedRefs.envVars])
 
-  const rawValues = useMemo(() => {
-    return Object.entries(subBlockValues).reduce<Record<string, unknown>>((acc, [key, entry]) => {
-      if (entry && typeof entry === 'object' && 'value' in entry) {
-        acc[key] = (entry as { value: unknown }).value
-      } else {
-        acc[key] = entry
-      }
-      return acc
-    }, {})
-  }, [subBlockValues])
-
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-
   // Check if this is a subflow block (loop or parallel)
   const isSubflow = block.type === 'loop' || block.type === 'parallel'
   const loopConfig = block.type === 'loop' ? loops?.[block.id] : undefined
@@ -1095,6 +1079,21 @@ function PreviewEditorContent({
     )
   }
 
+  const rawValues = useMemo(() => {
+    return Object.entries(subBlockValues).reduce<Record<string, unknown>>((acc, [key, entry]) => {
+      if (entry && typeof entry === 'object' && 'value' in entry) {
+        acc[key] = (entry as { value: unknown }).value
+      } else {
+        acc[key] = entry
+      }
+      return acc
+    }, {})
+  }, [subBlockValues])
+
+  const canonicalIndex = useMemo(
+    () => buildCanonicalIndex(blockConfig.subBlocks),
+    [blockConfig.subBlocks]
+  )
   const canonicalModeOverrides = block.data?.canonicalModes
   const effectiveAdvanced =
     (block.advancedMode ?? false) ||
@@ -1372,12 +1371,12 @@ function PreviewEditorContent({
 }
 
 /**
- * Preview editor wrapped in ReactFlowProvider for hook compatibility.
+ * Block details sidebar wrapped in ReactFlowProvider for hook compatibility.
  */
-export function PreviewEditor(props: PreviewEditorProps) {
+export function BlockDetailsSidebar(props: BlockDetailsSidebarProps) {
   return (
     <ReactFlowProvider>
-      <PreviewEditorContent {...props} />
+      <BlockDetailsSidebarContent {...props} />
     </ReactFlowProvider>
   )
 }

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

@@ -21,9 +21,11 @@ interface WorkflowPreviewBlockData {
 }
 
 /**
- * Preview block component for workflow visualization.
- * Renders block header, subblocks skeleton, and handles without
- * hooks, store subscriptions, or interactive features.
+ * Lightweight block component for workflow previews.
+ * Renders block header, dummy subblocks skeleton, and handles.
+ * Respects horizontalHandles and enabled state from workflow.
+ * No heavy hooks, store subscriptions, or interactive features.
+ * Used in template cards and other preview contexts for performance.
  */
 function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>) {
   const {

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

@@ -15,9 +15,10 @@ interface WorkflowPreviewSubflowData {
 }
 
 /**
- * Preview subflow component for workflow visualization.
- * Renders loop/parallel containers without hooks, store subscriptions,
- * or interactive features.
+ * Lightweight subflow component for workflow previews.
+ * Matches the styling of the actual SubflowNodeComponent but without
+ * hooks, store subscriptions, or interactive features.
+ * Used in template cards and other preview contexts for performance.
  */
 function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowData>) {
   const { name, width = 500, height = 300, kind, isPreviewSelected = false } = data

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

@@ -1,2 +1,2 @@
-export { PreviewEditor } from './components/preview-editor'
+export { BlockDetailsSidebar } from './components/block-details-sidebar'
 export { getLeftmostBlockId, WorkflowPreview } from './preview'

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

@@ -15,10 +15,14 @@ import 'reactflow/dist/style.css'
 import { createLogger } from '@sim/logger'
 import { cn } from '@/lib/core/utils/cn'
 import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
+import { NoteBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block'
+import { SubflowNodeComponent } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node'
+import { WorkflowBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block'
 import { WorkflowEdge } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge'
 import { estimateBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
 import { WorkflowPreviewBlock } from '@/app/workspace/[workspaceId]/w/components/preview/components/block'
 import { WorkflowPreviewSubflow } from '@/app/workspace/[workspaceId]/w/components/preview/components/subflow'
+import { getBlock } from '@/blocks'
 import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('WorkflowPreview')
@@ -130,6 +134,8 @@ interface WorkflowPreviewProps {
   onNodeContextMenu?: (blockId: string, mousePosition: { x: number; y: number }) => void
   /** Callback when the canvas (empty area) is clicked */
   onPaneClick?: () => void
+  /** Use lightweight blocks for better performance in template cards */
+  lightweight?: boolean
   /** Cursor style to show when hovering the canvas */
   cursorStyle?: 'default' | 'pointer' | 'grab'
   /** Map of executed block IDs to their status for highlighting the execution path */
@@ -139,10 +145,19 @@ interface WorkflowPreviewProps {
 }
 
 /**
- * Preview node types using minimal components without hooks or store subscriptions.
- * This prevents interaction issues while allowing canvas panning and node clicking.
+ * Full node types with interactive WorkflowBlock for detailed previews
  */
-const previewNodeTypes: NodeTypes = {
+const fullNodeTypes: NodeTypes = {
+  workflowBlock: WorkflowBlock,
+  noteBlock: NoteBlock,
+  subflowNode: SubflowNodeComponent,
+}
+
+/**
+ * Lightweight node types for template cards and other high-volume previews.
+ * Uses minimal components without hooks or store subscriptions.
+ */
+const lightweightNodeTypes: NodeTypes = {
   workflowBlock: WorkflowPreviewBlock,
   noteBlock: WorkflowPreviewBlock,
   subflowNode: WorkflowPreviewSubflow,
@@ -157,19 +172,17 @@ const edgeTypes: EdgeTypes = {
 interface FitViewOnChangeProps {
   nodeIds: string
   fitPadding: number
-  containerRef: React.RefObject<HTMLDivElement | null>
 }
 
 /**
- * Helper component that calls fitView when the set of nodes changes or when the container resizes.
+ * Helper component that calls fitView when the set of nodes changes.
  * Only triggers on actual node additions/removals, not on selection changes.
  * Must be rendered inside ReactFlowProvider.
  */
-function FitViewOnChange({ nodeIds, fitPadding, containerRef }: FitViewOnChangeProps) {
+function FitViewOnChange({ nodeIds, fitPadding }: FitViewOnChangeProps) {
   const { fitView } = useReactFlow()
   const lastNodeIdsRef = useRef<string | null>(null)
 
-  // Fit view when nodes change
   useEffect(() => {
     if (!nodeIds.length) return
     const shouldFit = lastNodeIdsRef.current !== nodeIds
@@ -182,27 +195,6 @@ function FitViewOnChange({ nodeIds, fitPadding, containerRef }: FitViewOnChangeP
     return () => clearTimeout(timeoutId)
   }, [nodeIds, fitPadding, fitView])
 
-  // Fit view when container resizes (debounced to avoid excessive calls during drag)
-  useEffect(() => {
-    const container = containerRef.current
-    if (!container) return
-
-    let timeoutId: ReturnType<typeof setTimeout> | null = null
-
-    const resizeObserver = new ResizeObserver(() => {
-      if (timeoutId) clearTimeout(timeoutId)
-      timeoutId = setTimeout(() => {
-        fitView({ padding: fitPadding, duration: 150 })
-      }, 100)
-    })
-
-    resizeObserver.observe(container)
-    return () => {
-      if (timeoutId) clearTimeout(timeoutId)
-      resizeObserver.disconnect()
-    }
-  }, [containerRef, fitPadding, fitView])
-
   return null
 }
 
@@ -218,12 +210,15 @@ export function WorkflowPreview({
   onNodeClick,
   onNodeContextMenu,
   onPaneClick,
+  lightweight = false,
   cursorStyle = 'grab',
   executedBlocks,
   selectedBlockId,
 }: WorkflowPreviewProps) {
-  const containerRef = useRef<HTMLDivElement>(null)
-  const nodeTypes = previewNodeTypes
+  const nodeTypes = useMemo(
+    () => (lightweight ? lightweightNodeTypes : fullNodeTypes),
+    [lightweight]
+  )
   const isValidWorkflowState = workflowState?.blocks && workflowState.edges
 
   const blocksStructure = useMemo(() => {
@@ -293,28 +288,119 @@ export function WorkflowPreview({
 
       const absolutePosition = calculateAbsolutePosition(block, workflowState.blocks)
 
-      // Handle loop/parallel containers
-      if (block.type === 'loop' || block.type === 'parallel') {
+      if (lightweight) {
+        if (block.type === 'loop' || block.type === 'parallel') {
+          const isSelected = selectedBlockId === blockId
+          const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
+          nodeArray.push({
+            id: blockId,
+            type: 'subflowNode',
+            position: absolutePosition,
+            draggable: false,
+            data: {
+              name: block.name,
+              width: dimensions.width,
+              height: dimensions.height,
+              kind: block.type as 'loop' | 'parallel',
+              isPreviewSelected: isSelected,
+            },
+          })
+          return
+        }
+
+        const isSelected = selectedBlockId === blockId
+
+        let lightweightExecutionStatus: ExecutionStatus | undefined
+        if (executedBlocks) {
+          const blockExecution = executedBlocks[blockId]
+          if (blockExecution) {
+            if (blockExecution.status === 'error') {
+              lightweightExecutionStatus = 'error'
+            } else if (blockExecution.status === 'success') {
+              lightweightExecutionStatus = 'success'
+            } else {
+              lightweightExecutionStatus = 'not-executed'
+            }
+          } else {
+            lightweightExecutionStatus = 'not-executed'
+          }
+        }
+
+        nodeArray.push({
+          id: blockId,
+          type: 'workflowBlock',
+          position: absolutePosition,
+          draggable: false,
+          // Blocks inside subflows need higher z-index to appear above the container
+          zIndex: block.data?.parentId ? 10 : undefined,
+          data: {
+            type: block.type,
+            name: block.name,
+            isTrigger: block.triggerMode === true,
+            horizontalHandles: block.horizontalHandles ?? false,
+            enabled: block.enabled ?? true,
+            isPreviewSelected: isSelected,
+            executionStatus: lightweightExecutionStatus,
+          },
+        })
+        return
+      }
+
+      if (block.type === 'loop') {
         const isSelected = selectedBlockId === blockId
         const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
         nodeArray.push({
           id: blockId,
           type: 'subflowNode',
           position: absolutePosition,
+          parentId: block.data?.parentId,
+          extent: block.data?.extent || undefined,
           draggable: false,
           data: {
+            ...block.data,
             name: block.name,
             width: dimensions.width,
             height: dimensions.height,
-            kind: block.type as 'loop' | 'parallel',
+            state: 'valid',
+            isPreview: true,
             isPreviewSelected: isSelected,
+            kind: 'loop',
           },
         })
         return
       }
 
-      // Handle regular blocks
-      const isSelected = selectedBlockId === blockId
+      if (block.type === 'parallel') {
+        const isSelected = selectedBlockId === blockId
+        const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
+        nodeArray.push({
+          id: blockId,
+          type: 'subflowNode',
+          position: absolutePosition,
+          parentId: block.data?.parentId,
+          extent: block.data?.extent || undefined,
+          draggable: false,
+          data: {
+            ...block.data,
+            name: block.name,
+            width: dimensions.width,
+            height: dimensions.height,
+            state: 'valid',
+            isPreview: true,
+            isPreviewSelected: isSelected,
+            kind: 'parallel',
+          },
+        })
+        return
+      }
+
+      const blockConfig = getBlock(block.type)
+      if (!blockConfig) {
+        logger.error(`No configuration found for block type: ${block.type}`, { blockId })
+        return
+      }
+
+      const nodeType = block.type === 'note' ? 'noteBlock' : 'workflowBlock'
 
       let executionStatus: ExecutionStatus | undefined
       if (executedBlocks) {
@@ -332,20 +418,24 @@ export function WorkflowPreview({
         }
       }
 
+      const isSelected = selectedBlockId === blockId
+
       nodeArray.push({
         id: blockId,
-        type: 'workflowBlock',
+        type: nodeType,
         position: absolutePosition,
         draggable: false,
         // Blocks inside subflows need higher z-index to appear above the container
         zIndex: block.data?.parentId ? 10 : undefined,
         data: {
           type: block.type,
+          config: blockConfig,
           name: block.name,
-          isTrigger: block.triggerMode === true,
-          horizontalHandles: block.horizontalHandles ?? false,
-          enabled: block.enabled ?? true,
+          blockState: block,
+          canEdit: false,
+          isPreview: true,
           isPreviewSelected: isSelected,
+          subBlockValues: block.subBlocks ?? {},
           executionStatus,
         },
       })
@@ -358,6 +448,7 @@ export function WorkflowPreview({
     parallelsStructure,
     workflowState.blocks,
     isValidWorkflowState,
+    lightweight,
     executedBlocks,
     selectedBlockId,
   ])
@@ -415,7 +506,6 @@ export function WorkflowPreview({
   return (
     <ReactFlowProvider>
       <div
-        ref={containerRef}
         style={{ height, width, backgroundColor: 'var(--bg)' }}
         className={cn('preview-mode', onNodeClick && 'interactive-nodes', className)}
       >
@@ -426,20 +516,6 @@ export function WorkflowPreview({
           .preview-mode .react-flow__selectionpane { cursor: ${cursorStyle} !important; }
           .preview-mode .react-flow__renderer { cursor: ${cursorStyle}; }
 
-          /* Active/grabbing cursor when dragging */
-          ${
-            cursorStyle === 'grab'
-              ? `
-          .preview-mode .react-flow:active { cursor: grabbing; }
-          .preview-mode .react-flow__pane:active { cursor: grabbing !important; }
-          .preview-mode .react-flow__selectionpane:active { cursor: grabbing !important; }
-          .preview-mode .react-flow__renderer:active { cursor: grabbing; }
-          .preview-mode .react-flow__node:active { cursor: grabbing !important; }
-          .preview-mode .react-flow__node:active * { cursor: grabbing !important; }
-          `
-              : ''
-          }
-
           /* Node cursor - pointer on nodes when onNodeClick is provided */
           .preview-mode.interactive-nodes .react-flow__node { cursor: pointer !important; }
           .preview-mode.interactive-nodes .react-flow__node > div { cursor: pointer !important; }
@@ -487,11 +563,7 @@ export function WorkflowPreview({
           }
           onPaneClick={onPaneClick}
         />
-        <FitViewOnChange
-          nodeIds={blocksStructure.ids}
-          fitPadding={fitPadding}
-          containerRef={containerRef}
-        />
+        <FitViewOnChange nodeIds={blocksStructure.ids} fitPadding={fitPadding} />
       </div>
     </ReactFlowProvider>
   )

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 } from 'lucide-react'
+import { Database, HelpCircle, Layout, Plus, Search, Settings, Table } 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,6 +263,12 @@ 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,6 +409,9 @@ describe('Blocks Module', () => {
         'workflow-input-mapper',
         'text',
         'router-input',
+        'table-selector',
+        'filter-builder',
+        'sort-builder',
       ]
 
       const blocks = getAllBlocks()

apps/sim/blocks/blocks/table.ts

@@ -0,0 +1,679 @@
+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/blocks/workflow.ts

@@ -1,5 +1,30 @@
+import { createLogger } from '@sim/logger'
 import { WorkflowIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+
+const logger = createLogger('WorkflowBlock')
+
+// Helper function to get available workflows for the dropdown
+const getAvailableWorkflows = (): Array<{ label: string; id: string }> => {
+  try {
+    const { workflows, activeWorkflowId } = useWorkflowRegistry.getState()
+
+    // Filter out the current workflow to prevent recursion
+    const availableWorkflows = Object.entries(workflows)
+      .filter(([id]) => id !== activeWorkflowId)
+      .map(([id, workflow]) => ({
+        label: workflow.name || `Workflow ${id.slice(0, 8)}`,
+        id: id,
+      }))
+      .sort((a, b) => a.label.localeCompare(b.label))
+
+    return availableWorkflows
+  } catch (error) {
+    logger.error('Error getting available workflows:', error)
+    return []
+  }
+}
 
 export const WorkflowBlock: BlockConfig = {
   type: 'workflow',
@@ -13,7 +38,8 @@ export const WorkflowBlock: BlockConfig = {
     {
       id: 'workflowId',
       title: 'Select Workflow',
-      type: 'workflow-selector',
+      type: 'combobox',
+      options: getAvailableWorkflows,
       placeholder: 'Search workflows...',
       required: true,
     },

apps/sim/blocks/blocks/workflow_input.ts

@@ -1,5 +1,18 @@
 import { WorkflowIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+
+const getAvailableWorkflows = (): Array<{ label: string; id: string }> => {
+  try {
+    const { workflows, activeWorkflowId } = useWorkflowRegistry.getState()
+    return Object.entries(workflows)
+      .filter(([id]) => id !== activeWorkflowId)
+      .map(([id, w]) => ({ label: w.name || `Workflow ${id.slice(0, 8)}`, id }))
+      .sort((a, b) => a.label.localeCompare(b.label))
+  } catch {
+    return []
+  }
+}
 
 export const WorkflowInputBlock: BlockConfig = {
   type: 'workflow_input',
@@ -12,19 +25,21 @@ export const WorkflowInputBlock: BlockConfig = {
   `,
   category: 'blocks',
   docsLink: 'https://docs.sim.ai/blocks/workflow',
-  bgColor: '#6366F1',
+  bgColor: '#6366F1', // Indigo - modern and professional
   icon: WorkflowIcon,
   subBlocks: [
     {
       id: 'workflowId',
       title: 'Select Workflow',
-      type: 'workflow-selector',
+      type: 'combobox',
+      options: getAvailableWorkflows,
       placeholder: 'Search workflows...',
       required: true,
     },
+    // Renders dynamic mapping UI based on selected child workflow's Start trigger inputFormat
     {
       id: 'inputMapping',
-      title: 'Inputs',
+      title: 'Input Mapping',
       type: 'input-mapping',
       description:
         "Map fields defined in the child workflow's Start block to variables/values in this workflow.",

apps/sim/blocks/registry.ts

@@ -121,6 +121,7 @@ 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'
@@ -288,6 +289,7 @@ 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,6 +26,7 @@ export type GenerationType =
   | 'typescript-function-body'
   | 'json-schema'
   | 'json-object'
+  | 'table-schema'
   | 'system-prompt'
   | 'custom-tool-schema'
   | 'sql-query'
@@ -72,6 +73,8 @@ 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.
    */
@@ -84,6 +87,7 @@ 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
@@ -103,6 +107,7 @@ 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,6 +4696,26 @@ 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,6 +73,7 @@ const DialogContent = React.forwardRef<
         }}
         {...props}
       >
+        <DialogPrimitive.Title>Dialog</DialogPrimitive.Title>
         {children}
         {!hideCloseButton && (
           <DialogPrimitive.Close